From 643b7024fb8d9378b186d3bd3c622e566f1a8ff6 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 13 Nov 2012 19:56:27 +0100 Subject: [PATCH] update to 1.1-20120706 --- .gitignore | 3 +-- dialog-libs.patch | 10 +++++----- dialog-multilib.patch | 18 ++++-------------- dialog.spec | 2 +- sources | 2 +- 5 files changed, 12 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 53e3c8c..1f78346 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -dialog-1.1-20100428.tgz -/dialog-1.1-20110707.tgz +/dialog-1.1-20120706.tgz diff --git a/dialog-libs.patch b/dialog-libs.patch index 8669336..3a0980a 100644 --- a/dialog-libs.patch +++ b/dialog-libs.patch @@ -1,7 +1,7 @@ -diff -up dialog-1.1-20110707/makefile.in.libs dialog-1.1-20110707/makefile.in ---- dialog-1.1-20110707/makefile.in.libs 2011-06-25 02:27:56.000000000 +0200 -+++ dialog-1.1-20110707/makefile.in 2011-07-26 13:04:50.389183890 +0200 -@@ -176,11 +176,11 @@ dialog$o \ +diff -up dialog-1.1-20120706/makefile.in.libs dialog-1.1-20120706/makefile.in +--- dialog-1.1-20120706/makefile.in.libs 2012-02-16 01:35:37.000000000 +0100 ++++ dialog-1.1-20120706/makefile.in 2012-11-13 19:53:14.193243663 +0100 +@@ -178,11 +178,11 @@ dialog$o \ $(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION $(LIB) : $(LIB_OBJECT) @@ -9,7 +9,7 @@ diff -up dialog-1.1-20110707/makefile.in.libs dialog-1.1-20110707/makefile.in + $(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(LIBS) $(RANLIB) $@ - dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@ + $(PROG)$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@ - $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS) $(LIBS) + $(LINK) -o $@ dialog$o -L. -l@PACKAGE@ $(LDFLAGS) diff --git a/dialog-multilib.patch b/dialog-multilib.patch index fc35c76..bbef5b1 100644 --- a/dialog-multilib.patch +++ b/dialog-multilib.patch @@ -1,6 +1,6 @@ -diff -up dialog-1.1-20110707/dialog-config.in.multilib dialog-1.1-20110707/dialog-config.in ---- dialog-1.1-20110707/dialog-config.in.multilib 2011-07-26 13:01:29.929082616 +0200 -+++ dialog-1.1-20110707/dialog-config.in 2011-07-26 13:01:29.932082618 +0200 +diff -up dialog-1.1-20120706/dialog-config.in.multilib dialog-1.1-20120706/dialog-config.in +--- dialog-1.1-20120706/dialog-config.in.multilib 2012-11-13 19:43:10.726813139 +0100 ++++ dialog-1.1-20120706/dialog-config.in 2012-11-13 19:43:10.730813141 +0100 @@ -32,7 +32,7 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" @@ -19,14 +19,4 @@ diff -up dialog-1.1-20110707/dialog-config.in.multilib dialog-1.1-20110707/dialo ENDECHO ;; # identification -diff -up dialog-1.1-20110707/headers-sh.in.multilib dialog-1.1-20110707/headers-sh.in ---- dialog-1.1-20110707/headers-sh.in.multilib 2011-01-06 10:38:25.000000000 +0100 -+++ dialog-1.1-20110707/headers-sh.in 2011-07-26 13:02:44.177120225 +0200 -@@ -127,6 +127,7 @@ EOF - echo "s,#include <${pkgname}_,#include <${PACKAGE}/${pkgname}_," >>$TMPSED - fi - -+ echo '/_FILE_OFFSET_BITS/d' >>$TMPSED - # reduce the count if possible, since some old sed's limit is 100 lines - sort -u $TMPSED >headers.tmp - mv headers.tmp $TMPSED +diff -up dialog-1.1-20120706/headers-sh.in.multilib dialog-1.1-20120706/headers-sh.in diff --git a/dialog.spec b/dialog.spec index 70aaa73..8eac275 100644 --- a/dialog.spec +++ b/dialog.spec @@ -1,6 +1,6 @@ Summary: A utility for creating TTY dialog boxes Name: dialog -%define dialogsubversion 20110707 +%global dialogsubversion 20120706 Version: 1.1 Release: 16.%{dialogsubversion}%{?dist} License: LGPLv2 diff --git a/sources b/sources index 1fca038..18f2816 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -34d01aaacbb2932b77774e6c1eec8d2a dialog-1.1-20110707.tgz +2e538305977178eb085a9859511c299d dialog-1.1-20120706.tgz