update to 1.3-20190806

This commit is contained in:
Miroslav Lichvar 2019-08-07 10:29:00 +02:00
parent 1ab8f1d920
commit d42e9b2f71
5 changed files with 16 additions and 41 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/dialog-1.3-20190728.tgz /dialog-1.3-20190806.tgz

View File

@ -1,23 +0,0 @@
diff -up dialog-1.3-20190728/dialog-config.in.incdir dialog-1.3-20190728/dialog-config.in
--- dialog-1.3-20190728/dialog-config.in.incdir 2019-07-29 14:15:19.654602452 +0200
+++ dialog-1.3-20190728/dialog-config.in 2019-07-29 14:17:05.144824851 +0200
@@ -31,6 +31,7 @@
prefix="@prefix@"
exec_prefix="@exec_prefix@"
datarootdir="@datarootdir@"
+includedir="@includedir@"
same_prefix=yes
same_exec_prefix=yes
@@ -84,10 +85,7 @@ while test $# -gt 0; do
;;
# compile/link
--cflags|--cflags-only-I)
- INCS=
- if test "${prefix}/include" != /usr/include ; then
- INCS="-I${prefix}/include"
- fi
+ INCS="-I$includedir"
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
$INCS
ENDECHO

View File

@ -1,21 +1,21 @@
diff -up dialog-1.3-20190728/dialog-config.in.multilib dialog-1.3-20190728/dialog-config.in diff -up dialog-1.3-20190806/dialog-config.in.multilib dialog-1.3-20190806/dialog-config.in
--- dialog-1.3-20190728/dialog-config.in.multilib 2019-07-29 14:17:53.149926054 +0200 --- dialog-1.3-20190806/dialog-config.in.multilib 2019-08-07 10:23:17.351928370 +0200
+++ dialog-1.3-20190728/dialog-config.in 2019-07-29 14:22:31.900513709 +0200 +++ dialog-1.3-20190806/dialog-config.in 2019-08-07 10:27:44.113487635 +0200
@@ -53,7 +53,7 @@ while test $# -gt 0; do @@ -53,7 +53,7 @@ while test $# -gt 0; do
fi
eval bindir='"@bindir@"' eval bindir='"@bindir@"'
eval includedir='"@includedir@"'
- eval libdir='"@libdir@"' - eval libdir='"@libdir@"'
+ eval libdir='' + eval libdir=''
eval datadir='"@datadir@"' eval datadir='"@datadir@"'
eval mandir='"@mandir@"' eval mandir='"@mandir@"'
@@ -95,7 +95,7 @@ ENDECHO @@ -62,7 +62,7 @@ while test $# -gt 0; do
;; eval LDFLAGS='"@LDFLAGS@"'
--libs) [ -z "$LDFLAGS" ] && LDFLAGS="-L${exec_prefix}/lib"
sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
- -L${exec_prefix}/lib -l${THIS} @LIBS@ - eval LIBS='"@LIBS@"'
+ -l${THIS} + eval LIBS=''
ENDECHO LIBS="-l${THIS} $LIBS"
;;
--libs-only-L) case "$1" in

View File

@ -1,13 +1,12 @@
Summary: A utility for creating TTY dialog boxes Summary: A utility for creating TTY dialog boxes
Name: dialog Name: dialog
%global dialogsubversion 20190728 %global dialogsubversion 20190806
Version: 1.3 Version: 1.3
Release: 19.%{dialogsubversion}%{?dist} Release: 19.%{dialogsubversion}%{?dist}
License: LGPLv2 License: LGPLv2
URL: https://invisible-island.net/dialog/dialog.html URL: https://invisible-island.net/dialog/dialog.html
Source: ftp://ftp.invisible-island.net/dialog/dialog-%{version}-%{dialogsubversion}.tgz Source: ftp://ftp.invisible-island.net/dialog/dialog-%{version}-%{dialogsubversion}.tgz
BuildRequires: ncurses-devel gcc gettext findutils libtool BuildRequires: ncurses-devel gcc gettext findutils libtool
Patch1: dialog-incdir.patch
Patch2: dialog-multilib.patch Patch2: dialog-multilib.patch
Patch3: dialog-libs.patch Patch3: dialog-libs.patch
@ -32,7 +31,6 @@ dialog library.
%prep %prep
%setup -q -n dialog-%{version}-%{dialogsubversion} %setup -q -n dialog-%{version}-%{dialogsubversion}
%patch1 -p1 -b .incdir
%patch2 -p1 -b .multilib %patch2 -p1 -b .multilib
%patch3 -p1 -b .libs %patch3 -p1 -b .libs

View File

@ -1 +1 @@
SHA512 (dialog-1.3-20190728.tgz) = e539f9691fbca289192deec87439b9d6a463b875b24082f6684c2a1c7f7b46bed1ba29a5380dd93dadd800a99bc7c60c9d065d7230bf21dcfbb8f361d7d15de6 SHA512 (dialog-1.3-20190806.tgz) = 2fdf74a6ecc1b86523299f5ec954d125bc913bddf985f152b40f3a25ed87642dd4410fea141f2f2f1b08c75e767db1a3df1d27b230e4d21b33bd80136d23a92b