SPECS (AC-branch): rpm.spec - updated etc_dir, no-neon patches from...

[qboosh]

Author: qboosh                       Date: Tue Jul 19 17:50:31 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated etc_dir,no-neon patches from HEAD, added home_etc bcond
- added file-update patch (for compatibility with *.mgc generated by file 4.14)
- release 9

---- Files affected:
SPECS:
   rpm.spec (1.555.2.91 -> 1.555.2.92) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.555.2.91 SPECS/rpm.spec:1.555.2.92
--- SPECS/rpm.spec:1.555.2.91	Fri Jul 15 19:13:10 2005
+++ SPECS/rpm.spec	Tue Jul 19 19:50:25 2005
@@ -10,6 +10,7 @@
 %bcond_with	static		# build static rpmi (not supported at the moment)
 %bcond_without	apidocs		# don't generate documentation with doxygen
 %bcond_without	autoreqdep	# don't autogenerate package name deps in addition to sonames/perl(X)
+%bcond_without	home_etc	# build without HOME_ETC support
 %bcond_without	python		# don't build python bindings
 %bcond_without	selinux		# build without selinux support
 %bcond_with	neon		# build with HTTP/WebDAV support (neon library)
@@ -32,7 +33,7 @@
 Name:		rpm
 %define	sover	4.4
 Version:	4.4.1
-Release:	8
+Release:	9
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -102,6 +103,7 @@
 Patch43:	%{name}-patch-quote.patch
 Patch44:	%{name}-no-neon.patch
 Patch45:	%{name}-no-sqlite.patch
+Patch46:	%{name}-file-update.patch
 URL:		http://www.rpm.org/
 Icon:		rpm.gif
 BuildRequires:	autoconf >= 2.52
@@ -113,7 +115,7 @@
 BuildRequires:	elfutils-devel >= 0.108
 BuildRequires:	findutils
 BuildRequires:	gettext-devel >= 0.11.4-2
-BuildRequires:	home-etc-devel >= 1:1.0.9-2
+%{?with_home_etc:BuildRequires:	home-etc-devel >= 1:1.0.9-2}
 #BuildRequires:	libmagic-devel
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
 # needed only for AM_PROG_CXX used for CXX substitution in rpm.macros
@@ -227,8 +229,10 @@
 Obsoletes:	rpm-libs
 # avoid SEGV caused by mixed db versions
 Conflicts:	poldek < 0.18.1-16
+%if %{with home_etc}
 # avoid linking to /usr/lib
 Conflicts:	home-etc < 1.0.9-2
+%endif
 
 %description lib
 RPMs library.
@@ -250,7 +254,7 @@
 Requires:	bzip2-devel
 Requires:	db-devel >= %{reqdb_ver}
 Requires:	elfutils-devel
-Requires:	home-etc-devel >= 1:1.0.9-2
+%{?with_home_etc:Requires:	home-etc-devel >= 1:1.0.9-2}
 %{?with_selinux:Requires:	libselinux-devel}
 Requires:	popt-devel >= %{reqpopt_ver}
 Requires:	zlib-devel
@@ -643,6 +647,7 @@
 %patch43 -p1
 %{!?with_neon:%patch44 -p1}
 %patch45 -p1
+%patch46 -p1
 %patch0 -p1
 %patch3 -p1
 
@@ -694,10 +699,11 @@
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	CPP="%{__cpp}" \
+	%{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies} \
 	--enable-shared \
 	--enable-static \
 	%{?with_apidocs:--with-apidocs} \
-	%{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies} \
+	%{?with_home_etc:--with-home_etc} \
 	%{?with_python:--with-python=auto} \
 	%{!?with_python:--without-python} \
 	%{!?with_selinux:--without-selinux} \
@@ -1097,6 +1103,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.555.2.92  2005/07/19 17:50:25  qboosh
+- updated etc_dir,no-neon patches from HEAD, added home_etc bcond
+- added file-update patch (for compatibility with *.mgc generated by file 4.14)
+- release 9
+
 Revision 1.555.2.91  2005/07/15 17:13:10  glen
 - rel 8; STBR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.555.2.91&r2=1.555.2.92&f=u