SPECS (rpm-4_5): rpm.spec - copy libtool files in build as these are extern...

[glen]

Author: glen                         Date: Sat Oct  4 21:40:15 2008 GMT
Module: SPECS                         Tag: rpm-4_5
---- Log message:
- copy libtool files in build as these are externally dependant files

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.49.2.24 -> 1.837.2.42.2.49.2.25) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.49.2.24 SPECS/rpm.spec:1.837.2.42.2.49.2.25
--- SPECS/rpm.spec:1.837.2.42.2.49.2.24	Sat Sep  6 20:21:56 2008
+++ SPECS/rpm.spec	Sat Oct  4 23:40:09 2008
@@ -10,6 +10,13 @@
 #   preserving payload format and compressor from original rpm, _not_ current settings
 #   /usr/bin/install: cannot stat `./it.gmo': No such file or directory
 #   /usr/bin/install: cannot stat `./sr at Latn.gmo': No such file or directory
+# - rpm2cpio borken:
+#glen at builder-ac pld/BUILD $ unpack dnews-5.5d1-1.src.rpm
+#* dnews-5.5d1-1.src.rpm... lzma: (stdin): Compressed data is corrupt
+#cpio: premature end of archive
+#DONE
+#glen at builder-ac pld/BUILD $ file dnews-5.5d1-1.src.rpm
+#dnews-5.5d1-1.src.rpm: RPM v3 src i386 dnews-5.5d1-1
 #
 # Conditional build:
 %bcond_with	static		# build static rpm+rpmi
@@ -50,7 +57,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	0.56
+Release:	0.57
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -141,6 +148,7 @@
 Patch78:	%{name}-db3-configure.patch
 Patch79:	%{name}-macros-cpp.patch
 Patch80:	%{name}-link-selinux.patch
+Patch81:	%{name}-db-configure.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -742,19 +750,11 @@
 rm -rf sqlite zlib popt
 
 %if %{with internal_db}
-cd db
 %if %{without nptl}
-sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
+sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' db/dist/aclocal/mutex.ac
 %endif
-cp -f /usr/share/aclocal/libtool.m4 dist/aclocal/libtool.ac
-cp -f /usr/share/automake/config.sub dist
-if [ -f /usr/share/libtool/config/ltmain.sh ]; then
-	cp -f /usr/share/libtool/config/ltmain.sh dist
-else
-	cp -f /usr/share/libtool/ltmain.sh dist
-fi
-cd -
 %patch78 -p1
+%patch81 -p1
 %else
 %patch15 -p1
 rm -rf db3 db rpmdb/db.h
@@ -798,6 +798,14 @@
 echo -e 'AC_CONFIG_AUX_DIR(.)\nAC_PROG_LIBTOOL'> configure.ac
 %{__libtoolize}
 rm -f configure.ac
+cd ../db
+cp -f /usr/share/aclocal/libtool.m4 dist/aclocal/libtool.ac
+cp -f /usr/share/automake/config.sub dist
+if [ -f /usr/share/libtool/config/ltmain.sh ]; then
+	cp -f /usr/share/libtool/config/ltmain.sh dist
+else
+	cp -f /usr/share/libtool/ltmain.sh dist
+fi
 cd ..
 %endif
 
@@ -1402,6 +1410,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.25  2008/10/04 21:40:09  glen
+- copy libtool files in build as these are externally dependant files
+
 Revision 1.837.2.42.2.49.2.24  2008/09/06 18:21:56  megabajt
 - added -link-selinux.patch to kill undefined reference in librpmdb
 - release 0.56
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.49.2.24&r2=1.837.2.42.2.49.2.25&f=u