Author: glen Date: Wed Sep 3 16:48:21 2008 GMT
Module: SPECS Tag: rpm-4_5
---- Log message:
- oops, rpm tarball already contains db dist, so only db4.5 is possible with
internal db
- however build still fails with it(some libtool problem?)
---- Files affected:
SPECS:
rpm.spec (1.837.2.42.2.49.2.20 -> 1.837.2.42.2.49.2.21)
---- Diffs:
================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.49.2.20 SPECS/rpm.spec:1.837.2.42.2.49.2.21
--- SPECS/rpm.spec:1.837.2.42.2.49.2.20 Wed Sep 3 18:23:24 2008
+++ SPECS/rpm.spec Wed Sep 3 18:48:15 2008
@@ -36,10 +36,8 @@
# versions of required libraries
%if "%{pld_release}" == "th"
%define reqdb_ver 4.7.25
-%define reqdb_patch 1
%else
%define reqdb_ver 4.5.20
-%define reqdb_patch 2
%endif
%define reqpopt_ver 1.10.8
%define beecrypt_ver 2:4.1.2-4
@@ -79,11 +77,6 @@
Source17: %{name}-java-requires
# http://svn.pld-linux.org/banner.sh/
Source18: banner.sh
-Source19: http://download.oracle.com/berkeley-db/db-4.5.20.tar.gz
-# Source19-md5: b0f1c777708cb8e9d37fb47e7ed3312d
-Source20: http://download.oracle.com/berkeley-db/db-4.7.25.tar.gz
-# Source20-md5: ec2b87e833779681a0c3a814aa71359e
-%patchset_source -f
http://www.oracle.com/technology/products/berkeley-db/db/update/%{reqdb_ver}/patch.%{reqdb_ver}.%g
1 %{reqdb_patch}
Patch1067: %{name}-disable-features.patch
Patch1070: %{name}-rpmrc-ac.patch
#Patch0: %{name}-pl.po.patch
@@ -663,13 +656,6 @@
%prep
%setup -q
-%if %{with internal_db}
-%if "%{pld_release}" == "th"
-%{__tar} -zxf %{SOURCE20} -C db --strip-components=1
-%else
-%{__tar} -zxf %{SOURCE19} -C db --strip-components=1
-%endif
-%endif
#%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -751,11 +737,10 @@
%patch79 -p1
mv -f po/{sr,[EMAIL PROTECTED]
-rm -rf sqlite zlib popt rpmdb/db.h
+rm -rf sqlite zlib popt
%if %{with internal_db}
cd db
-%patchset_patch 1 %{reqdb_patch}
%if %{without nptl}
sed -i -e 's,AM_PTHREADS_SHARED("POSIX/.*,:,' dist/aclocal/mutex.ac
%endif
@@ -770,7 +755,7 @@
%patch78 -p1
%else
%patch15 -p1
-rm -rf db3 db
+rm -rf db3 db rpmdb/db.h
%endif
%if "%{pld_release}" == "ac"
@@ -808,7 +793,9 @@
%{__automake}
%if %{with internal_db}
cd db3
+echo -e 'AC_CONFIG_AUX_DIR(.)\nAC_PROG_LIBTOOL'> configure.ac
%{__libtoolize}
+rm -f configure.ac
cd ..
%endif
@@ -1413,6 +1400,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.837.2.42.2.49.2.21 2008/09/03 16:48:15 glen
+- oops, rpm tarball already contains db dist, so only db4.5 is possible with
internal db
+- however build still fails with it(some libtool problem?)
+
Revision 1.837.2.42.2.49.2.20 2008/09/03 16:23:24 glen
- try refresh libtool for internal_db
- fix missing __cxx macro
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/rpm.spec?r1=1.837.2.42.2.49.2.20&r2=1.837.2.42.2.49.2.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
