SPECS (rpm-4_5): rpm.spec - try refresh libtool for internal_db - fix missi...

[glen]

Author: glen                         Date: Wed Sep  3 16:23:30 2008 GMT
Module: SPECS                         Tag: rpm-4_5
---- Log message:
- try refresh libtool for internal_db
- fix missing __cxx macro

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.49.2.19 -> 1.837.2.42.2.49.2.20) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.49.2.19 SPECS/rpm.spec:1.837.2.42.2.49.2.20
--- SPECS/rpm.spec:1.837.2.42.2.49.2.19	Wed Sep  3 17:39:10 2008
+++ SPECS/rpm.spec	Wed Sep  3 18:23:24 2008
@@ -147,6 +147,7 @@
 Patch76:	%{name}-pydebuginfo.patch
 Patch77:	%{name}-dirdeps-macro.patch
 Patch78:	%{name}-db3-configure.patch
+Patch79:	%{name}-macros-cpp.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -171,6 +172,7 @@
 BuildRequires:	python-modules >= 1:2.3
 BuildRequires:	rpm-perlprov
 %{?with_python:BuildRequires:	rpm-pythonprov}
+BuildRequires:	rpmbuild(macros) >= 1.351
 BuildRequires:	tar >= 1:1.15.1
 BuildRequires:	zlib-devel
 %if %{with apidocs}
@@ -296,10 +298,11 @@
 Summary(pl.UTF-8):	Biblioteki RPM-a
 Group:		Libraries
 Requires:	beecrypt >= %{beecrypt_ver}
-Requires:	db >= %{reqdb_ver}
-%{?with_selinux:Requires:	libselinux >= 1.18}
+%{!?with_internal_db:Requires:	db >= %{reqdb_ver}}
 %{?with_system_libmagic:Requires:	libmagic >= 1.15-2}
+%{?with_selinux:Requires:	libselinux >= 1.18}
 Requires:	popt >= %{reqpopt_ver}
+%{?with_nptl:Requires:	uname(release) >= 2.6.0}
 Requires:	zlib >= 1.2.3
 %{?with_suggest_tags:Suggests:	lzma >= 1:4.42.0}
 Obsoletes:	rpm-libs
@@ -745,6 +748,7 @@
 %patch76 -p1
 %endif
 %patch77 -p0
+%patch79 -p1
 
 mv -f po/{sr,sr at Latn}.po
 rm -rf sqlite zlib popt rpmdb/db.h
@@ -757,7 +761,11 @@
 %endif
 cp -f /usr/share/aclocal/libtool.m4 dist/aclocal/libtool.ac
 cp -f /usr/share/automake/config.sub dist
-cp -f /usr/share/libtool/ltmain.sh 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
 %else
@@ -798,6 +806,11 @@
 %{__autoheader}
 %{__autoconf}
 %{__automake}
+%if %{with internal_db}
+cd db3
+%{__libtoolize}
+cd ..
+%endif
 
 # config.guess doesn't handle athlon, so we have to change it by hand.
 # rpm checks for CPU type at runtime, but it looks better
@@ -1400,6 +1413,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+
 Revision 1.837.2.42.2.49.2.19  2008/09/03 15:39:10  glen
 - add nptl bcond for internal db
 - discard db-robustness patch (not used in db 4.5 either)
================================================================

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