SPECS (rpm-4_5): rpm.spec - internal_db bcond

[glen]

Author: glen                         Date: Wed Sep  3 13:06:37 2008 GMT
Module: SPECS                         Tag: rpm-4_5
---- Log message:
- internal_db bcond

---- Files affected:
SPECS:
   rpm.spec (1.837.2.42.2.49.2.14 -> 1.837.2.42.2.49.2.15) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.837.2.42.2.49.2.14 SPECS/rpm.spec:1.837.2.42.2.49.2.15
--- SPECS/rpm.spec:1.837.2.42.2.49.2.14	Tue Sep  2 10:01:32 2008
+++ SPECS/rpm.spec	Wed Sep  3 15:06:32 2008
@@ -16,8 +16,10 @@
 %bcond_without	apidocs		# don't generate documentation with doxygen
 %if "%{pld_release}" == "ac"
 %bcond_without	autoreqdep	# autogenerate package name deps in addition to sonames/perl(X)
+%bcond_without	internal_db		# internal db (db 4.5.20)
 %else
 %bcond_with	autoreqdep	# autogenerate package name deps in addition to sonames/perl(X)
+%bcond_with		internal_db		# internal db (db 4.5.20)
 %endif
 %bcond_without	python		# don't build python bindings
 %bcond_without	selinux		# build without selinux support
@@ -46,7 +48,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	0.52
+Release:	0.53
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -139,7 +141,7 @@
 BuildRequires:	automake >= 1.4
 BuildRequires:	beecrypt-devel >= %{beecrypt_ver}
 BuildRequires:	bzip2-devel >= 1.0.2-17
-BuildRequires:	db-devel >= %{reqdb_ver}
+%{!?with_internal_db:BuildRequires:	db-devel >= %{reqdb_ver}}
 BuildRequires:	elfutils-devel >= 0.108
 BuildRequires:	gettext-devel >= 0.11.4-2
 %{?with_system_libmagic:BuildRequires:	libmagic-devel}
@@ -169,7 +171,7 @@
 # Require static library only for static build
 BuildRequires:	beecrypt-static >= %{beecrypt_ver}
 BuildRequires:	bzip2-static >= 1.0.2-17
-BuildRequires:	db-static >= %{reqdb_ver}
+%{!?with_internal_db:BuildRequires:	db-static >= %{reqdb_ver}}
 BuildRequires:	elfutils-static
 BuildRequires:	glibc-static >= 2.2.94
 %{?with_system_libmagic:BuildRequires:	libmagic-static}
@@ -375,7 +377,7 @@
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	beecrypt-static >= %{beecrypt_ver}
 Requires:	bzip2-static
-Requires:	db-static >= %{reqdb_ver}
+%{!?with_internal_db:Requires:	db-static >= %{reqdb_ver}}
 Requires:	elfutils-static
 %{?with_system_libmagic:Requires:	libmagic-static}
 Requires:	popt-static >= %{reqpopt_ver}
@@ -658,7 +660,9 @@
 %patch11 -p1 -R
 %patch12 -p1
 %patch14 -p1
+%if %{without internal_db}
 %patch15 -p1
+%endif
 %patch17 -p1
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 echo '%%define	__perl_provides	%%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
@@ -724,9 +728,11 @@
 %patch76 -p1
 %patch77 -p0
 
-#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 db popt rpmdb/db.h
+%if %{without internal_db}
+rm -rf db3
+%endif
 
 %if "%{pld_release}" == "ac"
 %patch1067 -p1
@@ -1362,6 +1368,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.15  2008/09/03 13:06:32  glen
+- internal_db bcond
+
 Revision 1.837.2.42.2.49.2.14  2008/09/02 08:01:32  glen
 - s/uuid-devel/ossp-uuid-devel
 
================================================================

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