From a753e25f98f49081d5b14849cf4c431a5dc39647 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Mon, 29 Jul 2019 15:20:02 +0200 Subject: [PATCH] update to 1.3-20190728 --- .gitignore | 2 +- dialog-incdir.patch | 22 +++++++++++----------- dialog-multilib.patch | 26 +++++++++++++------------- dialog.spec | 2 +- sources | 2 +- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 34e76f3..d45a8d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/dialog-1.3-20190211.tgz +/dialog-1.3-20190728.tgz diff --git a/dialog-incdir.patch b/dialog-incdir.patch index f31f57b..9d20ca4 100644 --- a/dialog-incdir.patch +++ b/dialog-incdir.patch @@ -1,18 +1,18 @@ -diff -up dialog-1.1-20110707/dialog-config.in.incdir dialog-1.1-20110707/dialog-config.in ---- dialog-1.1-20110707/dialog-config.in.incdir 2011-01-06 10:38:03.000000000 +0100 -+++ dialog-1.1-20110707/dialog-config.in 2011-07-26 13:00:02.692038027 +0200 -@@ -35,6 +35,7 @@ bindir="@bindir@" - libdir="@libdir@" - datadir="@datadir@" - mandir="@mandir@" +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@" - THIS="@PACKAGE@" - -@@ -67,10 +68,7 @@ while test $# -gt 0; do + same_prefix=yes + same_exec_prefix=yes +@@ -84,10 +85,7 @@ while test $# -gt 0; do ;; # compile/link - --cflags) + --cflags|--cflags-only-I) - INCS= - if test "${prefix}/include" != /usr/include ; then - INCS="-I${prefix}/include" diff --git a/dialog-multilib.patch b/dialog-multilib.patch index ebf73a7..d6a97f1 100644 --- a/dialog-multilib.patch +++ b/dialog-multilib.patch @@ -1,16 +1,16 @@ -diff -up dialog-1.2-20121230/dialog-config.in.multilib dialog-1.2-20121230/dialog-config.in ---- dialog-1.2-20121230/dialog-config.in.multilib 2013-03-18 15:43:10.639021412 +0100 -+++ dialog-1.2-20121230/dialog-config.in 2013-03-18 15:44:08.519065774 +0100 -@@ -33,7 +33,7 @@ exec_prefix="@exec_prefix@" - datarootdir="@datarootdir@" +diff -up dialog-1.3-20190728/dialog-config.in.multilib dialog-1.3-20190728/dialog-config.in +--- dialog-1.3-20190728/dialog-config.in.multilib 2019-07-29 14:17:53.149926054 +0200 ++++ dialog-1.3-20190728/dialog-config.in 2019-07-29 14:22:31.900513709 +0200 +@@ -53,7 +53,7 @@ while test $# -gt 0; do + fi - bindir="@bindir@" --libdir="@libdir@" -+libdir= - datadir="@datadir@" - mandir="@mandir@" - includedir="@includedir@" -@@ -76,7 +76,7 @@ ENDECHO + eval bindir='"@bindir@"' +- eval libdir='"@libdir@"' ++ eval libdir='' + eval datadir='"@datadir@"' + eval mandir='"@mandir@"' + +@@ -95,7 +95,7 @@ ENDECHO ;; --libs) sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO @@ -18,4 +18,4 @@ diff -up dialog-1.2-20121230/dialog-config.in.multilib dialog-1.2-20121230/dialo + -l${THIS} ENDECHO ;; - # identification + --libs-only-L) diff --git a/dialog.spec b/dialog.spec index 815fd86..305b347 100644 --- a/dialog.spec +++ b/dialog.spec @@ -1,6 +1,6 @@ Summary: A utility for creating TTY dialog boxes Name: dialog -%global dialogsubversion 20190211 +%global dialogsubversion 20190728 Version: 1.3 Release: 18.%{dialogsubversion}%{?dist} License: LGPLv2 diff --git a/sources b/sources index 238e77b..45aabb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dialog-1.3-20190211.tgz) = 247639190c97c1baa6aa2cc75bc17593a0e33fcfcfd6dbc4a1903b55709f8f102c965de03f0620c48463f018525eb77f9b62b39db8331b811a227bbf39b254c4 +SHA512 (dialog-1.3-20190728.tgz) = e539f9691fbca289192deec87439b9d6a463b875b24082f6684c2a1c7f7b46bed1ba29a5380dd93dadd800a99bc7c60c9d065d7230bf21dcfbb8f361d7d15de6