X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=c246ce184767ea0630125e47cddc579f6c35fe38;hb=72d080a844407fb856f28128dc70db4c4aeb2f5d;hp=42d8d81dba9846646c6a0657056d477927fab2c0;hpb=a48527420dc6e917fdeee45eb8254b5bea93eb36;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index 42d8d81..c246ce1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -6,19 +6,20 @@
 # - use system libmagic not internal libfmagic
 #
 # Conditional build:
-# _without_static	- build shared /bin/rpm (doesn't work at the moment)
-# _without_docs		- don't generate documentation with doxygen
+%bcond_without	static	# - build shared /bin/rpm (doesn't work at the moment)
+%bcond_without	docs	# - don't generate documentation with doxygen
+%bcond_without	python	# - don't build python bindings
 # 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"
-#
+
 %include        /usr/lib/rpm/macros.python
 %define snap	20030610
 # versions of required libraries
-%define	reqdb_ver	4.1.25-1
+%define	reqdb_ver	4.2.50-1
 %define	reqpopt_ver	1.9
 %define	beecrypt_ver	3.0.0-0.20030610.1
-%define rpm_macros_rev	1.125
+%define rpm_macros_rev	1.133
 Summary:	RPM Package Manager
 Summary(de):	RPM Packet-Manager
 Summary(es):	Gestor de paquetes RPM
@@ -29,8 +30,7 @@ Summary(uk):	
 Name:		rpm
 %define	ver	4.3
 Version:	%{ver}
-%define	rel	0.%{snap}.20.7
-Release:	%{rel}
+Release:	0.%{snap}.32
 License:	GPL
 Group:		Base
 #Source0:	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz
@@ -76,7 +76,7 @@ Patch16:	%{name}-etc_dir.patch
 Patch17:	%{name}-system_libs-more.patch
 Patch18:	%{name}-php-deps.patch
 Patch19:	%{name}-python-fix.patch
-
+Patch20:	%{name}-ldconfig-always.patch
 Patch21:	%{name}-perl_req.patch
 Patch22:	%{name}-system_libs_more.patch
 Patch23:	%{name}-python_2_3.patch
@@ -91,6 +91,15 @@ Patch31:	%{name}-fdClose-typo.patch
 Patch32:	%{name}-userpmdepswrappers.patch
 Patch33:	%{name}-provides-dont-obsolete.patch
 Patch34:	%{name}-examplesaredoc.patch
+Patch35:	%{name}-po.patch
+Patch36:	%{name}-amd64.patch
+Patch37:	%{name}-notsc.patch
+Patch38:	%{name}-hack-norpmlibdep.patch
+Patch39:	%{name}-db42.patch
+Patch40:	%{name}-makefile-no_myLDADD_deps.patch
+Patch41:	%{name}-libdir64.patch
+Patch42:	%{name}-libdir-links.patch
+Patch43:	%{name}-python-libdir.patch
 URL:		http://www.rpm.org/
 Icon:		rpm.gif
 BuildRequires:	autoconf >= 2.52
@@ -98,19 +107,19 @@ BuildRequires:	automake
 BuildRequires:	beecrypt-devel >= %{beecrypt_ver}
 BuildRequires:	bzip2-devel >= 1.0.1
 BuildRequires:	db-devel >= %{reqdb_ver}
-%{!?_without_docs:BuildRequires:	doxygen}
+%{?with_docs:BuildRequires:	doxygen}
 BuildRequires:	gettext-devel >= 0.11.4-2
 BuildRequires:	elfutils-devel
 #BuildRequires:	libmagic-devel
 BuildRequires:	libtool
 BuildRequires:	patch >= 2.2
 BuildRequires:	popt-devel >= %{reqpopt_ver}
-BuildRequires:	python-devel >= 2.2
+%{?with_python:BuildRequires:	python-devel >= 2.2}
 BuildRequires:	python-modules >= 2.2
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
 BuildRequires:	zlib-devel
-%if %{!?_without_static:1}0
+%if %{with static}
 # Require static library only for static build
 BuildRequires:	beecrypt-static >= %{beecrypt_ver}
 BuildRequires:	bzip2-static >= 1.0.2-5
@@ -122,10 +131,15 @@ BuildRequires:	popt-static >= %{reqpopt_ver}
 BuildRequires:	zlib-static
 %endif
 Requires:	popt >= %{reqpopt_ver}
+Requires:	%{name}-lib = %{version}-%{release}
 Conflicts:	glibc < 2.2.92
+# avoid SEGV caused by mixed db versions
+Conflicts:	poldek < 0.18.1-16
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		__find_provides	%{SOURCE4}
+# not needed now (rpm processes rpmlib(*) deps internally) and didn't work
+# anyway (broken: uses obsolete find-provides script, pgrep(??? typo???))
+##define	__find_provides	%{SOURCE4}
 %define		_binary_payload	w9.gzdio
 %define		_noPayloadPrefix 1
 
@@ -137,6 +151,8 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		__cxx %{?force_cxx}%{!?force_cxx:%{_target_cpu}-pld-linux-g++}
 %define		__cpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E}
 
+%define		_rpmlibdir /usr/lib/rpm
+
 %description
 RPM is a powerful package manager, which can be used to build,
 install, query, verify, update, and uninstall individual software
@@ -195,7 +211,7 @@ Summary(pt_BR):	Arquivos de inclus
 Summary(ru):	èÅÄÅÒÙ É ÂÉÂÌÉÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ Ó rpm-ÐÁËÅÔÁÍÉ
 Summary(uk):	èÅÄÅÒÉ ÔÁ ¦Â̦ÏÔÅËÉ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm
 Group:		Development/Libraries
-Requires:	%{name}-lib = %{version}
+Requires:	%{name}-lib = %{version}-%{release}
 Requires:	beecrypt-devel >= %{beecrypt_ver}
 Requires:	bzip2-devel
 Requires:	db-devel
@@ -256,7 +272,7 @@ Summary(pt_BR):	Bibliotecas est
 Summary(ru):	óÔÁÔÉÞÅÓËÁÑ ÂÉÂÌÉÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ Ó rpm-ÐÁËÅÔÁÍÉ
 Summary(uk):	óÔÁÔÉÞÎÁ ¦Â̦ÏÔÅËÁ ÄÌÑ ÐÒÏÇÒÁÍ, ÝÏ ÐÒÁÃÀÀÔØ Ú ÐÁËÅÔÁÍÉ rpm
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 Requires:	beecrypt-static >= %{beecrypt_ver}
 Requires:	bzip2-static
 Requires:	db-static
@@ -291,7 +307,7 @@ Summary:	Additional utilities for managing rpm packages and database
 Summary(de):	Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Summary(pl):	Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami
 Group:		Applications/File
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Requires:	popt >= %{reqpopt_ver}
 
 %description utils
@@ -308,8 +324,7 @@ Summary:	Additional utilities for managing rpm packages and database
 Summary(de):	Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
 Summary(pl):	Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami
 Group:		Applications/File
-Requires:	%{name} = %{version}
-Requires:	%{name}-utils = %{version}
+Requires:	%{name}-utils = %{version}-%{release}
 Requires:	popt >= %{reqpopt_ver}
 
 %description utils-perl
@@ -321,12 +336,11 @@ Zusatzwerkzeuge f
 %description utils-perl -l pl
 Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami.
 
-
 %package utils-static
 Summary:	Static rpm utilities
 Summary(pl):	Statyczne narzêdzia rpm
 Group:		Applications/System
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description utils-static
 Static rpm utilities for repairing system in case something with
@@ -346,7 +360,7 @@ Summary:	Additional utilities for checking perl provides/requires in rpm package
 Summary(de):	Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen
 Summary(pl):	Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
 Group:		Applications/File
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Requires:	perl-devel
 Requires:	perl-modules
 
@@ -365,7 +379,7 @@ pakietach rpm.
 Summary:	Python macros, which simplifies creation of rpm packages with Python software
 Summary(pl):	Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w Pythonie
 Group:		Applications/File
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Requires:	python-modules
 
 %description pythonprov
@@ -380,7 +394,7 @@ Pythonie.
 Summary:	Additional utilities for managing rpm packages and database
 Summary(pl):	Dodatkowe narzêdzia do sprawdzania zale¿no¶ci skryptów php w rpm
 Group:		Applications/File
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description php-pearprov
 Additional utilities for checking php pear provides/requires in rpm
@@ -395,7 +409,7 @@ Summary:	Python interface to RPM library
 Summary(pl):	Pythonowy interfejs do biblioteki RPM-a
 Summary(pt_BR):	Módulo Python para aplicativos que manipulam pacotes RPM
 Group:		Development/Languages/Python
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 %pyrequires_eq	python
 Obsoletes:	rpm-python
 
@@ -428,6 +442,8 @@ Summary(pl):	Biblioteki RPM-a
 Group:		Libraries
 Requires:	db >= %{reqdb_ver}
 Requires:	popt >= %{reqpopt_ver}
+# avoid SEGV caused by mixed db versions
+Conflicts:	poldek < 0.18.1-16
 
 %description lib
 RPMs library.
@@ -444,11 +460,11 @@ Summary(ru):	
 Summary(uk):	óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦×
 Group:		Applications/File
 Requires(pre):	findutils
-Requires:	%{name} = %{version}
-Requires:	%{name}-utils = %{version}
+Requires:	%{name}-utils = %{version}-%{release}
 Requires:	/bin/id
 Requires:	awk
 Requires:	binutils
+Requires:	chrpath
 Requires:	diffutils
 Requires:	file >= 4.01
 Requires:	fileutils
@@ -458,6 +474,10 @@ Requires:	gcc >= 3.0.3
 %else
 Requires:	gcc
 %endif
+%ifarch amd64
+Conflicts:	automake < 1:1.7.9-2
+Conflicts:	libtool < 2:1.5-13
+%endif
 Requires:	glibc-devel
 Requires:	grep
 Requires:	gzip
@@ -499,10 +519,10 @@ Summary(pt_BR):	Scripts e programas execut
 Summary(ru):	óËÒÉÐÔÙ É ÕÔÉÌÉÔÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÂÏÒËÉ ÐÁËÅÔÏ×
 Summary(uk):	óËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÐÏÂÕÄÏ×É ÐÁËÅÔ¦×
 Group:		Applications/File
-Requires:	%{name}-build = %{version}
+Requires:	%{name}-build = %{version}-%{release}
 # these are optional
 #Requires:	cvs
-#Requires:	wget
+Requires:	wget
 
 %description build-tools
 Scripts for managing .spec files and building RPM packages.
@@ -547,6 +567,7 @@ construir pacotes usando o RPM.
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
@@ -572,6 +593,15 @@ cat %{SOURCE14} >> macros.in
 %patch32 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
+%patch38 -p1
+%patch39 -p1
+%patch40 -p1
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
 
 cd scripts;
 mv -f perl.req perl.req.in
@@ -619,40 +649,42 @@ mv -f macros.tmp macros.in
 	CC="%{__cc}" CXX="%{__cxx}" CPP="%{__cpp}" \
 	--enable-shared \
 	--enable-static \
-	%{!?_without_docs:--with-apidocs} \
-	--with-python=auto \
+	%{?with_docs:--with-apidocs} \
+	%{?with_python:--with-python=auto} \
+	%{!?with_python:--without-python} \
 	--without-db
 
 %{__make} \
-	%{?_without_static:rpm_LDFLAGS="\$(myLDFLAGS)"} \
+	%{!?with_static:rpm_LDFLAGS="\$(myLDFLAGS)"} \
 	myLDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib
+install -d $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 	pkgbindir="%{_bindir}"
 
-install macros.perl	$RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
-install macros.python	$RPM_BUILD_ROOT%{_libdir}/rpm/macros.python
-install macros.php	$RPM_BUILD_ROOT%{_libdir}/rpm/macros.php
+install macros.perl	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.perl
+install macros.python	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.python
+install macros.php	$RPM_BUILD_ROOT%{_rpmlibdir}/macros.php
 
 install %{SOURCE1} doc/manual/groups
-install %{SOURCE3} $RPM_BUILD_ROOT%{_libdir}/rpm/install-build-tree
-install %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/rpm/find-rpm-provides
-install %{SOURCE5} $RPM_BUILD_ROOT%{_libdir}/rpm/find-spec-bcond
+install %{SOURCE3} $RPM_BUILD_ROOT%{_rpmlibdir}/install-build-tree
+install %{SOURCE4} $RPM_BUILD_ROOT%{_rpmlibdir}/find-rpm-provides
+install %{SOURCE5} $RPM_BUILD_ROOT%{_rpmlibdir}/find-spec-bcond
 # 2 following files - to be removed or changed to find-elf-*
 # (to generate only ELF dependencies using objdump)???
-install %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides
-install %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires
-install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/rpm/compress-doc
-install %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/rpm/check-files
-install %{SOURCE15} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides-wrapper
-install %{SOURCE16} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires-wrapper
-install scripts/find-php*	$RPM_BUILD_ROOT%{_libdir}/rpm
-install scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_libdir}/rpm
+# WARNING: don't even try to use, currently broken by some 64-bit experiments
+install %{SOURCE7} $RPM_BUILD_ROOT%{_rpmlibdir}/find-provides
+install %{SOURCE8} $RPM_BUILD_ROOT%{_rpmlibdir}/find-requires
+install %{SOURCE10} $RPM_BUILD_ROOT%{_rpmlibdir}/compress-doc
+install %{SOURCE11} $RPM_BUILD_ROOT%{_rpmlibdir}/check-files
+install %{SOURCE15} $RPM_BUILD_ROOT%{_rpmlibdir}/find-provides-wrapper
+install %{SOURCE16} $RPM_BUILD_ROOT%{_rpmlibdir}/find-requires-wrapper
+install scripts/find-php*	$RPM_BUILD_ROOT%{_rpmlibdir}
+install scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_rpmlibdir}
 
 install %{SOURCE30} $RPM_BUILD_ROOT%{_bindir}/builder
 install %{SOURCE31} $RPM_BUILD_ROOT%{_bindir}/adapter.awk
@@ -702,10 +734,13 @@ install -d $RPM_BUILD_ROOT/var/spool/repackage
 
 # move libs to /lib
 for a in librpm-%{ver}.so librpmdb-%{ver}.so librpmio-%{ver}.so ; do
-	mv -f $RPM_BUILD_ROOT%{_libdir}/$a $RPM_BUILD_ROOT/lib
-	ln -s /lib/$a $RPM_BUILD_ROOT%{_libdir}/$a
+	mv -f $RPM_BUILD_ROOT%{_libdir}/$a $RPM_BUILD_ROOT/%{_lib}
+	ln -s /%{_lib}/$a $RPM_BUILD_ROOT%{_libdir}/$a
 done
 
+for f in $RPM_BUILD_ROOT%{_datadir}/locale/{en_RN,eu_ES,gl,hu,ro,wa,zh,zh_CN.GB2312}/LC_MESSAGES/rpm.mo ; do
+	[ "`file $f | sed -e 's/.*,//' -e 's/message.*//'`" -le 1 ] && rm -f $f
+done
 %find_lang %{name}
 
 rm -rf manual
@@ -719,7 +754,7 @@ rm -rf $RPM_BUILD_ROOT
 %postun lib -p /sbin/ldconfig
 
 %pre build
-find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
+find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
@@ -744,74 +779,79 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 
 %dir /var/lib/rpm
 %dir %attr(700,root,root) /var/spool/repackage
-%dir %{_libdir}/rpm
-#%attr(755,root,root) %{_libdir}/rpm/rpmd
-#%attr(755,root,root) %{_libdir}/rpm/rpmk
-#%attr(755,root,root) %{_libdir}/rpm/rpm[qv]
 
-%doc %attr(755,root,root) %{_libdir}/rpm/convertrpmrc.sh
+%dir %{_rpmlibdir}
+#%attr(755,root,root) %{_rpmlibdir}/rpmd
+#%attr(755,root,root) %{_rpmlibdir}/rpmk
+#%attr(755,root,root) %{_rpmlibdir}/rpm[qv]
+
+%doc %attr(755,root,root) %{_rpmlibdir}/convertrpmrc.sh
 
-%{_libdir}/rpm/rpmrc
-%{_libdir}/rpm/rpmpopt*
-%{_libdir}/rpm/macros
+%{_rpmlibdir}/rpmrc
+%{_rpmlibdir}/rpmpopt*
+%{_rpmlibdir}/macros
 
 %files lib
 %defattr(644,root,root,755)
-%attr(755,root,root) /lib/librpm*-*.so
+%attr(755,root,root) /%{_lib}/librpm*-*.so
 %attr(755,root,root) %{_libdir}/librpm*-*.so
 
 %files build
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/rpm/noauto*
-%attr(755,root,root) %{_libdir}/rpm/compress-doc
-%attr(755,root,root) %{_libdir}/rpm/cross-build
-%attr(755,root,root) %{_libdir}/rpm/find-provides
-%attr(755,root,root) %{_libdir}/rpm/find-provides-wrapper
-%attr(755,root,root) %{_libdir}/rpm/find-requires
-%attr(755,root,root) %{_libdir}/rpm/find-requires-wrapper
-%attr(755,root,root) %{_libdir}/rpm/find-rpm-provides
-%attr(755,root,root) %{_libdir}/rpm/find-spec-bcond
-%attr(755,root,root) %{_libdir}/rpm/find-lang.sh
-%attr(755,root,root) %{_libdir}/rpm/mkinstalldirs
-%attr(755,root,root) %{_libdir}/rpm/config.*
-%attr(755,root,root) %{_libdir}/rpm/getpo.sh
-%attr(755,root,root) %{_libdir}/rpm/install-build-tree
-%attr(755,root,root) %{_libdir}/rpm/brp-*
-%attr(755,root,root) %{_libdir}/rpm/check-files
-%attr(755,root,root) %{_libdir}/rpm/check-prereqs
-#%attr(755,root,root) %{_libdir}/rpm/cpanflute
-#%attr(755,root,root) %{_libdir}/rpm/cpanflute2
-#%attr(755,root,root) %{_libdir}/rpm/Specfile.pm
-%attr(755,root,root) %{_libdir}/rpm/http.req
-%attr(755,root,root) %{_libdir}/rpm/magic.prov
-%attr(755,root,root) %{_libdir}/rpm/magic.req
-%attr(755,root,root) %{_libdir}/rpm/u_pkg.sh
-%attr(755,root,root) %{_libdir}/rpm/vpkg-provides.sh
-%attr(755,root,root) %{_libdir}/rpm/vpkg-provides2.sh
-%attr(755,root,root) %{_libdir}/rpm/rpmb
-%attr(755,root,root) %{_libdir}/rpm/rpmt
-%{_libdir}/rpm/noarch-*
+%attr(755,root,root) %{_rpmlibdir}/compress-doc
+%attr(755,root,root) %{_rpmlibdir}/cross-build
+%attr(755,root,root) %{_rpmlibdir}/find-provides
+%attr(755,root,root) %{_rpmlibdir}/find-provides-wrapper
+%attr(755,root,root) %{_rpmlibdir}/find-requires
+%attr(755,root,root) %{_rpmlibdir}/find-requires-wrapper
+%attr(755,root,root) %{_rpmlibdir}/find-rpm-provides
+%attr(755,root,root) %{_rpmlibdir}/find-spec-bcond
+%attr(755,root,root) %{_rpmlibdir}/find-lang.sh
+%attr(755,root,root) %{_rpmlibdir}/mkinstalldirs
+%attr(755,root,root) %{_rpmlibdir}/config.*
+%attr(755,root,root) %{_rpmlibdir}/getpo.sh
+%attr(755,root,root) %{_rpmlibdir}/install-build-tree
+%attr(755,root,root) %{_rpmlibdir}/brp-*
+%attr(755,root,root) %{_rpmlibdir}/check-files
+%attr(755,root,root) %{_rpmlibdir}/check-prereqs
+#%attr(755,root,root) %{_rpmlibdir}/cpanflute
+#%attr(755,root,root) %{_rpmlibdir}/cpanflute2
+#%attr(755,root,root) %{_rpmlibdir}/Specfile.pm
+%attr(755,root,root) %{_rpmlibdir}/http.req
+%attr(755,root,root) %{_rpmlibdir}/magic.prov
+%attr(755,root,root) %{_rpmlibdir}/magic.req
+%attr(755,root,root) %{_rpmlibdir}/u_pkg.sh
+%attr(755,root,root) %{_rpmlibdir}/vpkg-provides.sh
+%attr(755,root,root) %{_rpmlibdir}/vpkg-provides2.sh
+%attr(755,root,root) %{_rpmlibdir}/rpmb
+%attr(755,root,root) %{_rpmlibdir}/rpmt
+%{_rpmlibdir}/noarch-*
 %ifarch i386 i486 i586 i686 athlon
-%{_libdir}/rpm/i?86*
-%{_libdir}/rpm/athlon*
+%{_rpmlibdir}/i?86*
+%{_rpmlibdir}/athlon*
+%endif
+%ifarch amd64
+%{_rpmlibdir}/amd64*
+%{_rpmlibdir}/x86_64*
 %endif
 %ifarch sparc sparc64
-%{_libdir}/rpm/sparc*
+%{_rpmlibdir}/sparc*
 %endif
 %ifarch alpha
-%{_libdir}/rpm/alpha*
+%{_rpmlibdir}/alpha*
 %endif
 %ifarch ppc
-%{_libdir}/rpm/ppc*
+%{_rpmlibdir}/ppc*
 %endif
 # must be here for "Requires: rpm-*prov" to work
-%{_libdir}/rpm/macros.perl
-%{_libdir}/rpm/macros.php
+%{_rpmlibdir}/macros.perl
+%{_rpmlibdir}/macros.php
 # not used yet ...
-%{_libdir}/rpm/sql.prov
-%{_libdir}/rpm/sql.req
-%{_libdir}/rpm/tcl.req
-%{_libdir}/rpm/trpm
+%{_rpmlibdir}/sql.prov
+%{_rpmlibdir}/sql.req
+%{_rpmlibdir}/tcl.req
+%{_rpmlibdir}/trpm
 
 %attr(755,root,root) %{_bindir}/javadeps
 %attr(755,root,root) %{_bindir}/gendiff
@@ -844,18 +884,18 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) %{_bindir}/rpmdeps
 %attr(755,root,root) %{_bindir}/rpmgraph
 %attr(755,root,root) %{_bindir}/rpmfile
-%attr(755,root,root) %{_libdir}/rpm/find-debuginfo.sh
-%attr(755,root,root) %{_libdir}/rpm/rpm2cpio.sh
-%attr(755,root,root) %{_libdir}/rpm/tgpg
-%attr(755,root,root) %{_libdir}/rpm/rpmdb_loadcvt
+%attr(755,root,root) %{_rpmlibdir}/find-debuginfo.sh
+%attr(755,root,root) %{_rpmlibdir}/rpm2cpio.sh
+%attr(755,root,root) %{_rpmlibdir}/tgpg
+%attr(755,root,root) %{_rpmlibdir}/rpmdb_loadcvt
 
 %files utils-perl
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/rpm/rpmdiff*
+%attr(755,root,root) %{_rpmlibdir}/rpmdiff*
 # not here
-#%%{_libdir}/rpm/rpm.daily
-#%%{_libdir}/rpm/rpm.log
-#%%{_libdir}/rpm/rpm.xinetd
+#%%{_rpmlibdir}/rpm.daily
+#%%{_rpmlibdir}/rpm.log
+#%%{_rpmlibdir}/rpm.xinetd
 
 %{_mandir}/man8/rpm2cpio.8*
 %{_mandir}/man8/rpmdeps.8*
@@ -874,32 +914,34 @@ find /usr/lib/rpm -name '*-linux' -type l | xargs rm -f
 %files utils-static
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/rpm[ieu]
-%attr(755,root,root) %{_libdir}/rpm/rpm[ieu]
+%attr(755,root,root) %{_rpmlibdir}/rpm[ieu]
 
 %files perlprov
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/rpm/perl.*
-#%attr(755,root,root) %{_libdir}/rpm/perldeps.pl
-#%attr(755,root,root) %{_libdir}/rpm/find-perl-*
-%attr(755,root,root) %{_libdir}/rpm/find-*.perl
-%attr(755,root,root) %{_libdir}/rpm/find-prov.pl
-%attr(755,root,root) %{_libdir}/rpm/find-req.pl
-%attr(755,root,root) %{_libdir}/rpm/get_magic.pl
+%attr(755,root,root) %{_rpmlibdir}/perl.*
+#%attr(755,root,root) %{_rpmlibdir}/perldeps.pl
+#%attr(755,root,root) %{_rpmlibdir}/find-perl-*
+%attr(755,root,root) %{_rpmlibdir}/find-*.perl
+%attr(755,root,root) %{_rpmlibdir}/find-prov.pl
+%attr(755,root,root) %{_rpmlibdir}/find-req.pl
+%attr(755,root,root) %{_rpmlibdir}/get_magic.pl
 
 %files pythonprov
 %defattr(644,root,root,755)
-%{_libdir}/rpm/macros.python
+%{_rpmlibdir}/macros.python
 
 %files php-pearprov
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/rpm/php*
-%attr(755,root,root) %{_libdir}/rpm/find-php*
+%attr(755,root,root) %{_rpmlibdir}/php*
+%attr(755,root,root) %{_rpmlibdir}/find-php*
 
+%if %{with python}
 %files -n python-rpm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/*.so
 %attr(755,root,root) %{py_sitedir}/rpmdb/*.so
 %{py_sitedir}/rpmdb/*.py*
+%endif
 
 %files build-tools
 %defattr(644,root,root,755)