- update to 1.1-20071028

- fix multilib conflicts (#341001) - use shared library, drop static - merge review fixes (#225693)
2007-11-05 13:10:51 +00:00 · 2007-11-05 13:10:51 +00:00 · a994c121b9
commit a994c121b9
parent 15578caa52
5 changed files with 96 additions and 23 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-dialog-1.1-20070704.tgz
+dialog-1.1-20071028.tgz
--- a/dialog-1.1-20071028-libs.patch
+++ b/dialog-1.1-20071028-libs.patch
@ -0,0 +1,17 @@
+diff -up dialog-1.1-20071028/makefile.in.libs dialog-1.1-20071028/makefile.in
+--- dialog-1.1-20071028/makefile.in.libs	2007-07-04 21:33:35.000000000 +0200
+++ dialog-1.1-20071028/makefile.in	2007-10-30 17:17:46.000000000 +0100
+@@ -122,11 +122,11 @@ dialog$o \
+ $(OBJECTS) : $(srcdir)/dialog.h $(srcdir)/dlg_keys.h dlg_config.h VERSION
+ 
+ $(LIB) : $(LIB_OBJECT)
+-	$(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT)
+	$(LIBTOOL_CREATE) $(LIB) $(LIB_OBJECT) $(LIBS)
+ 	$(RANLIB) $@
+ 
+ dialog$x : $(LIB) dialog$o @INTLDIR_MAKE@ @INTLLIBS@
+-	$(LINK) -o $@ dialog$o -L. -ldialog $(LDFLAGS) $(LIBS)
+	$(LINK) -o $@ dialog$o -L. -ldialog $(LDFLAGS)
+ 
+ clean	\
+ distclean \
--- a/dialog-1.1-20071028-multilib.patch
+++ b/dialog-1.1-20071028-multilib.patch
@ -0,0 +1,32 @@
+diff -up dialog-1.1-20071028/dialog-config.in.multilib dialog-1.1-20071028/dialog-config.in
+--- dialog-1.1-20071028/dialog-config.in.multilib	2007-11-05 11:50:35.000000000 +0100
+++ dialog-1.1-20071028/dialog-config.in	2007-11-05 11:50:35.000000000 +0100
+@@ -32,7 +32,7 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ 
+ bindir="@bindir@"
+-libdir="@libdir@"
+libdir=
+ datadir="@datadir@"
+ mandir="@mandir@"
+ includedir="@includedir@"
+@@ -74,7 +74,7 @@ ENDECHO
+ 		;;
+ 	--libs)
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+-			-L${exec_prefix}/lib -l${THIS} @LIBS@
+			-l${THIS}
+ ENDECHO
+ 		;;
+ 	# identification
+diff -up dialog-1.1-20071028/headers-sh.in.multilib dialog-1.1-20071028/headers-sh.in
+--- dialog-1.1-20071028/headers-sh.in.multilib	2007-07-05 02:20:18.000000000 +0200
+++ dialog-1.1-20071028/headers-sh.in	2007-11-05 12:28:24.000000000 +0100
+@@ -118,6 +118,7 @@ EOF
+ 		echo "s/\\<$name\\>/${PKGNAME}_$name/g" >>$TMPSED
+ 	done
+ 
+	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
--- a/dialog.spec
+++ b/dialog.spec
@ -1,15 +1,17 @@
 Summary: A utility for creating TTY dialog boxes
 Name: dialog
-%define dialogsubversion 20070704
+%define dialogsubversion 20071028
 Version: 1.1
-Release: 2.%{dialogsubversion}%{?dist}
+Release: 3.%{dialogsubversion}%{?dist}
 License: LGPLv2
 Group: Applications/System
 URL: http://invisible-island.net/dialog/dialog.html
 Source: ftp://invisible-island.net/dialog/dialog-%{version}-%{dialogsubversion}.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ncurses-devel gettext findutils 
-Patch: dialog-1.1-20070227-incdir.patch
+BuildRequires: ncurses-devel gettext findutils libtool
+Patch1: dialog-1.1-20070227-incdir.patch
+Patch2: dialog-1.1-20071028-multilib.patch
+Patch3: dialog-1.1-20071028-libs.patch

 %description
 Dialog is a utility that allows you to show dialog boxes (containing
@ -23,7 +25,7 @@ Install dialog if you would like to create TTY dialog boxes.
 %package devel 
 Summary: Development files for building applications with the dialog library
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release} ncurses-devel

 %description devel
 Dialog is a utility that allows you to show dialog boxes (containing
@ -33,42 +35,64 @@ dialog library.

 %prep
 %setup -q -n dialog-%{version}-%{dialogsubversion}
-%patch -p1 -b .incdir
+%patch1 -p1 -b .incdir
+%patch2 -p1 -b .multilib
+%patch3 -p1 -b .libs

 %build
-%configure --enable-nls --with-ncursesw --enable-shared --includedir=/usr/include/dialog
+%configure \
+	--enable-nls \
+	--with-libtool \
+	--with-ncursesw \
+	--includedir=%{_includedir}/dialog
 make %{?_smp_mflags}

 %install
 rm -rf $RPM_BUILD_ROOT
-fgrep -l -r perl samples|xargs rm -f
-find samples -type f -print0 |xargs -0 chmod a-x
+
+# prepare packaged samples
+rm -rf _samples
+mkdir _samples
+cp -a samples _samples
+rm -rf _samples/samples/install
+find _samples -type f -print0 | xargs -0 chmod a-x

 make install DESTDIR=$RPM_BUILD_ROOT
-make install-lib DESTDIR=$RPM_BUILD_ROOT 

-%find_lang %name
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libdialog.so.*.*.*
+rm -f $RPM_BUILD_ROOT%{_libdir}/libdialog.{,l}a
+
+%find_lang %{name}

 %clean
 rm -rf $RPM_BUILD_ROOT

+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files -f %{name}.lang
-%defattr(-,root,root)
-%doc COPYING dialog.lsm README samples
-%{_prefix}/bin/dialog
+%defattr(-,root,root,-)
+%doc COPYING dialog.lsm README _samples/samples
+%{_bindir}/dialog
+%{_libdir}/libdialog.so.*
 %{_mandir}/man1/dialog.*
-%{_mandir}/man3/dialog.*
-#%{_datadir}/locale/*/LC_MESSAGES/dialog.mo

 %files devel
-%defattr(-,root,root)
-%doc COPYING dialog.lsm README
-%{_prefix}/bin/dialog-config
+%defattr(-,root,root,-)
+%{_bindir}/dialog-config
 %{_includedir}/dialog
-%{_libdir}/libdialog.a
+%{_libdir}/libdialog.so
+%{_mandir}/man3/dialog.*

 %changelog
-* Fri Aug 17 2007 Harald Hoyer <harald@rawhide.home> - 1.1-2.20070704
+* Mon Nov 05 2007 Miroslav Lichvar <mlichvar@redhat.com> - 1.1-3.20071028
+- update to 1.1-20071028
+- fix multilib conflicts (#341001)
+- use shared library, drop static
+- merge review fixes (#225693)
+
+* Fri Aug 17 2007 Harald Hoyer <harald@redhat.com> - 1.1-2.20070704
 - changed license to LGPLv2

 * Thu Jul  5 2007 Harald Hoyer <harald@redhat.com> - 1.1-1.20070704
--- a/2
+++ b/2
@ -1 +1 @@
-79ebcdbad22bd0c6ff8cfe95e7539fc4  dialog-1.1-20070704.tgz
+73604d3b3a43b5a122709a7a8e4edee2  dialog-1.1-20071028.tgz