SPECS (rpm-4_4_9-internal_bdb): rpm.spec - testing with internal 4...

[arekm]

Author: arekm                        Date: Sat Nov  3 15:12:04 2007 GMT
Module: SPECS                         Tag: rpm-4_4_9-internal_bdb
---- Log message:
- testing with internal 4.5 bdb

---- Files affected:
SPECS:
   rpm.spec (1.837.2.5 -> 1.837.2.5.2.1) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.5 SPECS/rpm.spec:1.837.2.5.2.1
--- SPECS/rpm.spec:1.837.2.5	Fri Nov  2 14:01:32 2007
+++ SPECS/rpm.spec	Sat Nov  3 16:11:59 2007
@@ -36,7 +36,7 @@
 Summary(uk.UTF-8):	ĐœĐľĐ˝ĐľĐ´ĐśĐľŃ€ пакотів від RPM
 Name:		rpm
 Version:	4.4.9
-Release:	10
+Release:	10.1
 License:	GPL
 Group:		Base
 Source0:	http://rpm5.org/files/rpm/rpm-4.4/%{name}-%{version}.tar.gz
@@ -99,7 +99,7 @@
 Patch38:	%{name}-rpm5-patchset-8021.patch
 Patch41:	%{name}-reduce-stack-usage.patch
 Patch42:	%{name}-old-fileconflicts-behaviour.patch
-Patch43:	%{name}-rpm5-patchset-8637.patch
+
 Patch44:	%{name}-no-neon.patch
 Patch45:	%{name}-no-sqlite.patch
 Patch46:	%{name}-mono.patch
@@ -187,7 +187,7 @@
 # stabilize new build environment
 %define		__newcc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc}
 %define		__newcxx %{?force_cxx}%{!?force_cxx:%{_target_cpu}-pld-linux-g++}
-%define		__newcpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E}
+%define		__newcpp %{?force_cpp}%{!?force_cpp:cpp}
 
 %define		_rpmlibdir /usr/lib/rpm
 
@@ -631,7 +631,8 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
+# internal bdb
+#%patch15 -p1
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
@@ -669,7 +670,6 @@
 %patch38 -p1
 %patch41 -p1
 %patch42 -p1
-%patch43 -p1
 %{!?with_neon:%patch44 -p1}
 %patch45 -p1
 %patch46 -p1
@@ -698,7 +698,7 @@
 mv -f po/{no,nb}.po
 mv -f po/{sr,sr at Latn}.po
 
-rm -rf sqlite zlib db db3 popt rpmdb/db.h
+rm -rf sqlite zlib popt
 
 # generate Group translations to *.po
 awk -f %{SOURCE6} %{SOURCE1}
@@ -710,6 +710,13 @@
 done
 
 %build
+cd db/dist
+cp -f /usr/share/aclocal/libtool.m4 aclocal/libtool.ac
+cp -f /usr/share/automake/config.sub .
+cp -f /usr/share/libtool/ltmain.sh .
+sh s_config
+cd ../..
+
 %if %{with system_libmagic}
 rm -rf file
 %else
@@ -1207,11 +1214,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.837.2.5  2007/11/02 13:01:32  arekm
-- fix --root --rebuilddb
-
-Revision 1.837.2.4  2007/11/02 12:04:00  arekm
-- use rpm provided check files (checks symlinks, too)
+Revision 1.837.2.5.2.1  2007/11/03 15:11:59  arekm
+- testing with internal 4.5 bdb
 
 Revision 1.837.2.3  2007/11/01 10:13:48  arekm
 - rel 10 (still far from being perfect)
================================================================

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