SPECS: rpm.spec - merged some changes from AC-branch: - libs dep...

Tue Jul 19 19:48:02 CEST 2005

Author: qboosh                       Date: Tue Jul 19 17:48:02 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged some changes from AC-branch:
  - libs deps to make rpm working without /usr
  - disable neon and sqlite dependencies (no-neon,no-sqlite patches)
  - readded home_etc support (etc_dir patch) - but with bcond
  - patch-quote patch
- added file-update patch (for compatibility with *.mgc generated by file 4.14)
- release 9.1

---- Files affected:
SPECS:
   rpm.spec (1.675 -> 1.676) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.675 SPECS/rpm.spec:1.676

--- SPECS/rpm.spec:1.675	Fri Jul 15 23:02:25 2005
+++ SPECS/rpm.spec	Tue Jul 19 19:47:57 2005
@@ -10,8 +10,10 @@
 %bcond_with	static		# build static rpmi (not supported at the moment)
 %bcond_without	apidocs		# don't generate documentation with doxygen
 %bcond_with	autoreqdep	# 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)
 # force_cc		- force using __cc other than "%{_target_cpu}-pld-linux-gcc"
 # force_cxx		- force using __cxx other than "%{_target_cpu}-pld-linux-g++"
 # force_cpp		- force using __cpp other than "%{_target_cpu}-pld-linux-gcc -E"
@@ -19,7 +21,7 @@
 # versions of required libraries
 %define	reqdb_ver	4.3.27-1
 %define	reqpopt_ver	1.10.1
-%define	beecrypt_ver	2:4.1.0
+%define	beecrypt_ver	2:4.1.2-4
 %define	rpm_macros_rev	1.231
 Summary:	RPM Package Manager
 Summary(de):	RPM Packet-Manager
@@ -31,7 +33,7 @@
 Name:		rpm
 %define	sover	4.4
 Version:	4.4.1
-Release:	1.99
+Release:	9.1
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -98,24 +100,31 @@
 Patch40:	%{name}-print-requires.patch
 Patch41:	%{name}-reduce-stack-usage.patch
 Patch42:	%{name}-glob.patch
+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
 BuildRequires:	automake
 BuildRequires:	beecrypt-devel >= %{beecrypt_ver}
-BuildRequires:	bzip2-devel >= 1.0.1
+BuildRequires:	bzip2-devel >= 1.0.2-17
 BuildRequires:	db-devel >= %{reqdb_ver}
 %{?with_apidocs:BuildRequires:	doxygen}
-BuildRequires:	elfutils-devel
+BuildRequires:	elfutils-devel >= 0.108
 BuildRequires:	findutils
 BuildRequires:	gettext-devel >= 0.11.4-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
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
+%if %{with neon}
 BuildRequires:	libxml2-devel
 BuildRequires:	neon-devel >= 0.24.7-3
+%endif
 BuildRequires:	patch >= 2.2
 BuildRequires:	popt-devel >= %{reqpopt_ver}
 %{?with_python:BuildRequires:	python-devel >= 2.2}
@@ -126,7 +135,7 @@
 %if %{with static}
 # Require static library only for static build
 BuildRequires:	beecrypt-static >= %{beecrypt_ver}
-BuildRequires:	bzip2-static >= 1.0.2-5
+BuildRequires:	bzip2-static >= 1.0.2-17
 BuildRequires:	db-static >= %{reqdb_ver}
 BuildRequires:	glibc-static >= 2.2.94
 BuildRequires:	elfutils-static
@@ -212,11 +221,17 @@
 Summary:	RPMs library
 Summary(pl):	Biblioteki RPM-a
 Group:		Libraries
+Requires:	beecrypt >= %{beecrypt_ver}
 Requires:	db >= %{reqdb_ver}
-%{?with_selinux:BuildRequires:	libselinux >= 1.18}
+%{?with_selinux:Requires:	libselinux >= 1.18}
 Requires:	popt >= %{reqpopt_ver}
+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.
@@ -238,6 +253,7 @@
 Requires:	bzip2-devel
 Requires:	db-devel >= %{reqdb_ver}
 Requires:	elfutils-devel
+%{?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
@@ -583,8 +599,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-# home-etc FIXME
-#%patch14 -p1
+%patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
@@ -625,6 +640,10 @@
 %patch40 -p1
 %patch41 -p1
 %patch42 -p1
+%patch43 -p1
+%{!?with_neon:%patch44 -p1}
+%patch45 -p1
+%patch46 -p1
 %patch0 -p1
 %patch3 -p1
 
@@ -636,7 +655,7 @@
 mv -f po/{no,nb}.po
 mv -f po/{sr,sr at Latn}.po
 
-rm -rf neon zlib libelf db db3 popt rpmdb/db.h
+rm -rf sqlite zlib db db3 popt rpmdb/db.h
 
 # generate Group translations to *.po
 awk -f %{SOURCE6} %{SOURCE1}
@@ -676,10 +695,11 @@
 	CC="%{__newcc}" \
 	CXX="%{__newcxx}" \
 	CPP="%{__newcpp}" \
+	%{?with_autoreqdep:--enable-adding-packages-names-in-autogenerated-dependancies} \
 	--enable-shared \
 	--enable-static \
-	%{?with_apidoc:--with-apidocs} \
-	%{?with_pkgnameinautoreq:--enable-adding-packages-names-in-autogenerated-dependancies} \
+	%{?with_apidocs:--with-apidocs} \
+	%{?with_home_etc:--with-home_etc} \
 	%{?with_python:--with-python=auto} \
 	%{!?with_python:--without-python} \
 	%{!?with_selinux:--without-selinux} \
@@ -697,6 +717,7 @@
 	debugedit_LDADD="\$(WITH_LIBELF_LIB) -lpopt"
 
 #	%{!?with_static:rpm_LDFLAGS="\$(myLDFLAGS)"} \
+
 %{?with_apidocs:%{__make} doxygen}
 
 %install
@@ -1081,6 +1102,15 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.676  2005/07/19 17:47:57  qboosh
+- merged some changes from AC-branch:
+  - libs deps to make rpm working without /usr
+  - disable neon and sqlite dependencies (no-neon,no-sqlite patches)
+  - readded home_etc support (etc_dir patch) - but with bcond
+  - patch-quote patch
+- added file-update patch (for compatibility with *.mgc generated by file 4.14)
+- release 9.1
+
 Revision 1.675  2005/07/15 21:02:25  pluto
 - use internal glob().
 
================================================================

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


