X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=21618995cef56959c9d4c79bcef40d517447b14a;hp=7f536bae34554b5236a3a6fb721dce0bdf7f1685;hb=f2aa369a3d8b720f3305913a7093e932ead662e0;hpb=313a4d1a33412a1b80af93c9109ed4bfcb32d959

diff --git a/rpm.spec b/rpm.spec
index 7f536ba..2161899 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,18 +1,17 @@
-Summary:	Red Hat (and now also PLD) Package Manager
-Summary(de):	Red Hat (und jetzt auch PLD) Packet-Manager
+%include        /usr/lib/rpm/macros.python
+%define	beecrypt_ver	2.2.0
+%define	beecrypt_rel	0.91
+Summary:	RPM Package Manager
+Summary(de):	RPM Packet-Manager
 Summary(es):	Gestor de paquetes RPM
-Summary(pl):	Aplikacja do zarz±dzania pakietami
+Summary(pl):	Aplikacja do zarz±dzania pakietami RPM
 Summary(pt_BR):	Gerenciador de pacotes RPM
 Name:		rpm
-Version:	4.0.2
-Release:	48
+Version:	4.1
+Release:	1
 License:	GPL
 Group:		Base
-Group(de):	Gründsätzlich
-Group(es):	Base
-Group(pl):	Podstawowe
-Group(pt_BR):	Base
-Source0:	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/%{name}-%{version}.tar.gz
+Source0:	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/%{name}-%{version}.tar.gz
 Source1:	%{name}.groups
 Source2:	%{name}.macros
 Source3:	%{name}-install-tree
@@ -26,70 +25,79 @@ Source10:	%{name}-find-provides
 Source11:	%{name}-find-requires
 Source12:	%{name}-non-english-man-pages.tar.bz2
 Source13:	%{name}-macros.python
-Patch0:		%{name}-rpmrc.patch
-Patch1:		%{name}-macros.patch
+Source14:	%{name}-groups-po.awk
+Source15:	%{name}-compress-doc
+Source16:	%{name}-check-files
+Source17:	%{name}-php-provides
+Source18:	%{name}-php-requires
+Source19:	%{name}-find-php-provides
+Source20:	%{name}-find-php-requires
+Source21:	%{name}-macros.php
+Patch0:		%{name}-%{name}rc.patch
 Patch2:		%{name}-arch.patch
-Patch3:		%{name}-rpmpopt.patch
+Patch3:		%{name}-%{name}popt.patch
 Patch4:		%{name}-perl-macros.patch
-Patch5:		%{name}-db3.patch
-Patch6:		%{name}-segv.patch
-Patch7:		%{name}-am_fix.patch
-Patch8:		%{name}-perl-req-perlfile.patch
-Patch9:		%{name}-installplatform.patch
-Patch10:	%{name}-cache.patch
-Patch11:	%{name}-suggestions.patch
-Patch12:	%{name}-rh-lame.patch
-Patch13:	%{name}-glob.patch
-Patch14:	%{name}-header_h.patch
-Patch15:	%{name}-fast-alAddPackage.patch
-Patch16:	%{name}-byKey.patch
-Patch17:	%{name}-perlprov.patch
-Patch18:	%{name}-noperldir.patch
-Patch19:	popt-cvs20010530.patch
-Patch20:	%{name}-noexpand.patch
-Patch21:	%{name}-scripts-closefds.patch
-Patch22:	%{name}-python-amfix.patch
-Patch23:	%{name}-non-english-man-pages.patch
-Patch24:	%{name}-progress-nontty.patch
-Patch25:	%{name}-am_ac.patch
-Patch26:	%{name}-python-macros.patch
-Patch27:	%{name}-hardlink-fixes.patch
-Patch28:	%{name}-perlprov-regonly.patch
-Patch29:	%{name}-cxx.patch
-Patch37:        %{name}-short_circuit.patch
-Patch38:        %{name}-section_test.patch
+Patch5:		%{name}-am_fix.patch
+Patch6:		%{name}-perl-req-perlfile.patch
+Patch7:		%{name}-installplatform.patch
+Patch8:		%{name}-cache.patch
+Patch9:		%{name}-glob.patch
+Patch10:	%{name}-header_h.patch
+Patch11:	%{name}-fast-alAddPackage.patch
+Patch12:	%{name}-byKey.patch
+Patch13:	%{name}-noexpand.patch
+Patch14:	%{name}-scripts-closefds.patch
+Patch15:	%{name}-python-amfix.patch
+Patch16:	%{name}-non-english-man-pages.patch
+Patch17:	%{name}-python-macros.patch
+Patch18:	%{name}-perlprov-regonly.patch
+Patch19:	%{name}-acconfig.patch
+Patch20:	%{name}-db4.patch
+Patch21:	%{name}-pl.po.patch
+Patch22:	%{name}-drop-legacy-CLI.patch
+Patch23:	%{name}-perlprov-perl5.6.patch
+Patch24:	%{name}-ac25x.patch
+Patch25:	%{name}-gettext-in-header.patch
+Patch26:	%{name}-compress-doc.patch
+Patch27:	%{name}-lt14d.patch
+Patch28:	%{name}-check_files.patch
+Patch29:	%{name}-gettext0.11.patch
+Patch30:	%{name}-choke-on-evil-doc.patch
+Patch31:	%{name}-build.patch
+Patch32:	%{name}-python-link.patch
+Patch33:	%{name}-system_libs.patch
+Patch34:	%{name}-bb-and-short-circuit.patch
 URL:		http://www.rpm.org/
 Icon:		rpm.gif
-BuildRequires:	autoconf >= 2.50
+BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
-BuildRequires:	db3-devel >= 3.1.17-9
-BuildRequires:	db1-devel >= 1.85
-BuildRequires:	db3-devel >= 3.1.17-9
-BuildRequires:	gettext-devel >= 0.10.38-3
-BuildRequires:	python-devel
+BuildRequires:	bzip2-devel >= 1.0.1
+BuildRequires:	db-devel >= 4.1
+BuildRequires:	doxygen
+BuildRequires:	gettext-devel >= 0.11.4-2
+BuildRequires:	libelf-devel
+BuildRequires:	libtool
+BuildRequires:	patch >= 2.2
+BuildRequires:	python-devel >= 2.2
+BuildRequires:	python-modules >= 2.2
+BuildRequires:	rpm-pythonprov
 BuildRequires:	zlib-devel
-BuildRequires:	python-modules >= 2.2.1
-BuildRequires:	zlib-devel >= 1.1.4
+BuildRequires:	popt-devel >= 1.7
 %if %{!?_without_static:1}%{?_without_static:0}
 # Require static library only for static build
-BuildRequires:	db3-static >= 3.1.17-9
-BuildRequires:	db1-static >= 1.85
+BuildRequires:	bzip2-static >= 1.0.2-5
+BuildRequires:	db-static >= 4.1
+BuildRequires:	glibc-static >= 2.2.94
+BuildRequires:	libelf-static
 BuildRequires:	zlib-static
-BuildRequires:	zlib-static >= 1.1.4
-Obsoletes:	rpm-libs
+BuildRequires:	popt-static >= 1.7
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:	rpm-libs
-Conflicts:	glibc < 2.2
+Conflicts:	glibc < 2.2.92
 
 %define		__find_provides	%{SOURCE4}
 %define		_binary_payload	w9.gzdio
 
-%define		py_ver		%(echo `python -c "import sys; print sys.version[:3]"`)
-%define		py_prefix	%(echo `python -c "import sys; print sys.prefix"`)
-%define		py_libdir	%{py_prefix}/lib/python%{py_ver}
-%define		py_dyndir	%{py_libdir}/lib-dynload
-%define		pyrequires_eq() Requires:	%1 >= %py_ver %1 < %(echo `python -c "import sys; import string; ver=sys.version[:3].split('.'); ver[1]=str(int(ver[1])+1); print string.join(ver, '.')"`)
-
 %description
 RPM is a powerful package manager, which can be used to build,
 install, query, verify, update, and uninstall individual software
@@ -130,17 +138,12 @@ Summary:	Header files and libraries
 Summary(de):	Header-Dateien uns Libraries
 Summary(es):	Archivos de inclusión y bibliotecas para programas de manipulación de paquetes rpm
 Summary(pl):	Pliki nag³ówkowe i biblioteki statyczne
-Group(de):	Entwicklung/Libraries
-Group(es):	Desarrollo/Bibliotecas
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
-Group(pt_BR):	Desenvolvimento/Bibliotecas
-Group(ru):	òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):	òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Summary(pt_BR):	Arquivos de inclusão e bibliotecas para programas de manipulação de pacotes RPM
 Group:		Development/Libraries
 Requires:	%{name} = %{version}
-Requires:	popt-devel
+Requires:	popt-devel >= 1.7
+Requires:	beecrypt-devel
+Requires:	db-devel
 
 %description devel
 The RPM packaging system includes a C library that makes it easy to
@@ -176,13 +179,6 @@ ferramentas que precisem de conhecimento profundo de pacotes RPM.
 Summary:	RPM static libraries
 Summary(de):	RPMs statische Libraries
 Summary(pl):	Biblioteki statyczne RPM-a
-Group(de):	Entwicklung/Libraries
-Group(es):	Desarrollo/Bibliotecas
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
-Group(pt_BR):	Desenvolvimento/Bibliotecas
-Group(ru):	òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):	òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Summary(pt_BR):	Bibliotecas estáticas para o desenvolvimento de aplicações RPM
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}
@@ -194,7 +190,7 @@ RPM static libraries.
 RPMs statische Libraries.
 
 %description static -l pl
-%description static l pt_BR
+Biblioteki statyczne RPM-a.
 
 %description static -l pt_BR
 Bibliotecas estáticas para desenvolvimento.
@@ -202,11 +198,10 @@ Bibliotecas est
 %package utils
 Summary:	Additional utilities for managing rpm packages and database
 Summary(de):	Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken
-Group(de):	Applikationen/Datei
-Group(pl):	Aplikacje/Pliki
 Summary(pl):	Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami
 Group:		Applications/File
 Requires:	%{name} = %{version}
+Requires:	popt >= 1.7
 
 %description utils
 Additional utilities for managing rpm packages and database.
@@ -220,12 +215,10 @@ Dodatkowe narz
 %package perlprov
 Summary:	Additional utilities for checking perl provides/requires in rpm packages
 Summary(de):	Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen
-Group(de):	Applikationen/Datei
-Group(pl):	Aplikacje/Pliki
 Summary(pl):	Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
 Group:		Applications/File
+Requires:	%{name} = %{version}
 Requires:	perl-modules
-Requires:	findutils
 
 %description perlprov
 Additional utilities for checking perl provides/requires in rpm
@@ -240,10 +233,8 @@ pakietach rpm.
 
 %package pythonprov
 Summary:	Python macros, which simplifies creation of rpm packages with Python software
-Group(de):	Applikationen/Datei
-Group(pl):	Aplikacje/Pliki
 Summary(pl):	Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w Pythonie
-Requires:	python
+Group:		Applications/File
 Requires:	%{name} = %{version}
 Requires:	python-modules
 
@@ -253,16 +244,30 @@ software.
 
 %description pythonprov -l pl
 Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w
-%package python
+Pythonie.
+
+%package php-pearprov
+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}
+
+%description php-pearprov
+Additional utilities for checking php pear provides/requires in rpm
+packages.
+
+%description php-pearprov -l pl
+Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów php pear w
+pakietach rpm.
 
 %package -n python-rpm
 Summary:	Python interface to RPM library
-Group:		Development/Languages/Python
-Group(de):	Entwicklung/Sprachen/Python
-Group(pl):	Programowanie/Jêzyki/Python
+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}
 %pyrequires_eq	python
-%description python
+Obsoletes:	rpm-python
 
 %description -n python-rpm
 The rpm-python package contains a module which permits applications
@@ -270,14 +275,14 @@ written in the Python programming language to use the interface
 supplied by RPM (RPM Package Manager) libraries.
 
 This package should be installed if you want to develop Python
-%description python -l pl
+programs that will manipulate RPM packages and databases.
 
 %description -n python-rpm -l pl
 Pakiet rpm-python zawiera modu³, który pozwala aplikacjom napisanym w
 Pythonie na u¿ywanie interfejsu dostarczanego przez biblioteki RPM-a.
 
 Pakiet ten powinien zostaæ zainstalowany, je¶li chcesz pisaæ w
-%description python -l pt_BR -n
+Pythonie programy manipuluj±ce pakietami i bazami danych rpm.
 
 %description -n python-rpm -l pt_BR
 O pacote rpm-python contém um módulo que permite que aplicações
@@ -287,30 +292,46 @@ RPM (RPM Package Manager).
 Esse pacote deve ser instalado se você quiser desenvolver programas em
 Python para manipular pacotes e bancos de dados RPM.
 
+%package lib
+Summary:	RPMs library
+Summary(pl):	Biblioteki RPMa
+Group:		Libraries
+
+%description lib
+RPMs library.
+
+%description lib -l pl
+Biblioteki RPMa.
+
 %package build
-Summary:	Scripts for building binary RPM packages
-Summary(de):	Scripts fürs Bauen binärer RPM-Pakete
-Summary(pl):	Skrypty pomocnicze do budowania binarnych RPM-ów
-Group(de):	Applikationen/Datei
-Group(pl):	Aplikacje/Pliki
-Summary(pt_BR):	Scripts e programas executáveis usados para construir pacotes
-Group:		Applications/File
-Requires:	/bin/id
-Requires:	awk
-Requires:	binutils
-Requires:	diffutils
-Requires:	file >= 3.31
-Requires:	gcc >= 3.0.3
-Requires:	gcc
-Requires:	glibc-devel
-Requires:	grep
-Requires:	gzip
-Requires:	make
-Requires:	patch
-Requires:	popt >= 1.6.2-2
-Requires:	sed
-Requires:	tar
-Requires:	textutils
+Summary:        Scripts for building binary RPM packages
+Summary(de):    Scripts fürs Bauen binärer RPM-Pakete
+Summary(pl):    Skrypty pomocnicze do budowania binarnych RPM-ów
+Summary(pt_BR): Scripts e programas executáveis usados para construir pacotes
+Group:          Applications/File
+Requires:       %{name} = %{version}
+Requires:       /bin/id
+Requires:       awk
+Requires:       binutils
+Requires:       diffutils
+Requires:       file >= 3.31
+Requires:       fileutils
+Requires:       findutils
+%ifarch athlon
+Requires:       gcc >= 3.0.3
+%else
+Requires:       gcc
+%endif
+Requires:       glibc-devel
+Requires:       grep
+Requires:       gzip
+Requires:       make
+Requires:       patch
+Requires:       popt >= 1.7
+Requires:       sed
+Requires:       sh-utils
+Requires:       tar
+Requires:       textutils
 
 %description build
 Scripts for building binary RPM packages.
@@ -325,98 +346,165 @@ Skrypty pomocnicze do budowania binarnych RPM-
 Este pacote contém scripts e programas executáveis que são usados para
 construir pacotes usando o RPM.
 
+%package -n beecrypt
+Summary:	Crypto library
+Summary(pl):	Biblioteka kryptograficzna
+Version:	%{beecrypt_ver}
+Release:	%{beecrypt_rel}
+Epoch:		1
+Group:		Libraries
+
+%description -n beecrypt
+Crypto library (modified for rpm needs).
+
+%description -n beecrypt -l pl
+Biblioteka kryptograficzna (zmodyfikowana na potrzeby rpma).
+
+%package -n beecrypt-devel
+Summary:	Crypto library - development files
+Summary(pl):	Biblioteka kryptograficzna - pliki developerskie
+Version:	%{beecrypt_ver}
+Release:	%{beecrypt_rel}
+Group:		Development/Libraries
+Requires:	beecrypt = %{beecrypt_ver}
+Epoch:		1
+
+%description -n beecrypt-devel
+Crypto library - development files.
+
+%description -n beecrypt-devel -l pl
+Biblioteka kryptograficzna - pliki developerskie.
+
+%package -n beecrypt-static
+Summary:	Crypto library - static version
+Summary(pl):	Statyczna biblioteka kryptograficzna
+Version:	%{beecrypt_ver}
+Release:	%{beecrypt_rel}
+Group:		Development/Libraries
+Requires:	beecrypt-devel = %{beecrypt_ver}
+Epoch:		1
+
+%description -n beecrypt-static
+Static version of crypto library.
+
+%description -n beecrypt-static -l pl
+Statyczna wersja biblioteki kryptograficznej.
+
 %prep
 %setup -q -a12
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+# needed ?
+#%patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch11 -p0
-%patch12 -p0
-%patch11 -p0
-%patch12 -p0
-%patch15 -p0
-%patch16 -p0
-%patch15 -p0
-%patch16 -p0
+# applied
+#%patch7 -p1
+# not needed ? (break compilation)
+#%patch8 -p1
+%patch9 -p1
+# needed ?
+#%patch10 -p1
+# rejected (needed ?)
+#%patch11 -p1
+# too many rejects, Pawel please check if needed and rediff
+#%patch12 -p0
+%patch13 -p1
+%patch14 -p1
+# applied
+#%patch15 -p1
+# applied
+#%patch16 -p1
 %patch17 -p1
 %patch18 -p1
-%patch19 -p1
+# fixed
+#%patch19 -p1
+%patch20 -p1
+# needed ?
+#%patch21 -p1
 %patch22 -p1
 %patch23 -p1
-%patch24 -p1
+#%patch24 -p1
 %patch25 -p1
-%patch26 -p0
+%patch26 -p1
 %patch27 -p1
-%patch28 -p1
+# applied
+#%patch28 -p1
 %patch29 -p1
+# applied
+#%patch30 -p1
 %patch31 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
 
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
-install %{SOURCE9} scripts/find-lang.sh
+install %{SOURCE5} macros.perl.in
 install %{SOURCE13} macros.python.in
+install %{SOURCE21} macros.php.in
 install %{SOURCE6} scripts/find-perl-provides
 install %{SOURCE7} scripts/find-perl-requires
 install %{SOURCE9} scripts/find-lang.sh
+install %{SOURCE17} scripts/php.prov.in
+install %{SOURCE18} scripts/php.req.in
+install %{SOURCE19} scripts/find-php-provides
+install %{SOURCE20} scripts/find-php-requires
 
-(cd scripts;
+cd scripts;
 mv -f perl.req perl.req.in
-mv -f perl.prov perl.prov.in)
+mv -f perl.prov perl.prov.in
+cd ..
+
+chmod +x %{SOURCE4}
+rm -rf zlib libelf db db3 popt rpmdb/db.h
+
 %build
 # generate Group translations to *.po
 awk -f %{SOURCE14} %{SOURCE1}
 
-cd popt
-autoconf
-automake -a -c
 aclocal
 autoheader
-automake -a -c -f
+%{__autoconf}
+%{__automake}
+cd beecrypt
+rm -f missing
+%{__libtoolize}
+aclocal
+autoheader
+%{__autoconf}
 %{__automake}
 cd ..
 
 rm -f missing
-libtoolize --force --copy
-autoconf
-# ugly workaround for automake
-sed -e 's#cpio.c $(DBLIBOBJS) depends.c#cpio.c depends.c#g' \
-	lib/Makefile.am > lib/Makefile.am.new
-mv -f lib/Makefile.am.new lib/Makefile.am
-automake -a -c
-sed -e 's#cpio.c depends.c#cpio.c $(DBLIBOBJS) depends.c#g' \
-	lib/Makefile.in > lib/Makefile.in.new
-mv -f lib/Makefile.in.new lib/Makefile.in
-
-sed -e 's#python1.5#python%{py_ver}#g' \
-	python/Makefile.in > python/Makefile.in.new
-mv -f python/Makefile.in.new python/Makefile.in
-
-sed -e 's#python1.5#python%{py_ver}#g' \
-	python/Makefile.in > python/Makefile.in.new
-sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' macros.in | \
-	sed 's|@host_cpu@|%{_target_cpu}|' | \
+%{__libtoolize}
+%{__gettextize} --intl
+if [ ! -f po/Makevars -a -f po/Makevars.template ] ; then
+	cp po/Makevars.template po/Makevars
+fi
+aclocal
+autoupdate
+autoheader || :
+%{__autoconf}
+%{__automake}
+
 # 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
-sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' macros.in | \
-	sed 's|@host_cpu@|%{_target_cpu}|' > macros.tmp
-	--enable-v1-packages \
-	--with-python
+sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|'  \
+	-e 's|@host_cpu@|%{_target_cpu}|'  macros.in  > macros.tmp
+mv -f macros.tmp macros.in
+
 %configure \
 	--enable-shared \
-	--enable-v1-packages \
-	--with-python
+	--enable-static \
+	--with-apidocs \
+	--with-python=auto \
+	--without-db
 
-
-%{__make} %{?_without_static:rpm_LDFLAGS="\\$(myLDFLAGS)"}
+%{__make} \
+	%{?_without_static:rpm_LDFLAGS="\$(myLDFLAGS)"} \
+	myLDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -425,15 +513,20 @@ rm -rf $RPM_BUILD_ROOT
 	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.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 %{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 %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/rpm/find-spec-bcond
 install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/rpm/find-provides
 install %{SOURCE11} $RPM_BUILD_ROOT%{_libdir}/rpm/find-requires
 install %{SOURCE15} $RPM_BUILD_ROOT%{_libdir}/rpm/compress-doc
+install %{SOURCE16} $RPM_BUILD_ROOT%{_libdir}/rpm/check-files
+install scripts/find-php*	$RPM_BUILD_ROOT%{_libdir}/rpm/
+install scripts/php.{prov,req}	$RPM_BUILD_ROOT%{_libdir}/rpm/
 
 install rpmio/ugid.h $RPM_BUILD_ROOT%{_includedir}/rpm
 
@@ -447,27 +540,21 @@ EOF
 
 %find_lang %{name}
 
-# DON'T BREAK BUILD TREE!!!
-# rm -f doc/manual/Makefile*
-
-gzip -9nf RPM-PGP-KEY CHANGES doc/manual/*
+rm -f doc/manual/Makefile*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
 %postun -p /sbin/ldconfig
+%post   -n beecrypt -p /sbin/ldconfig
+%postun -n beecrypt -p /sbin/ldconfig
 
-%attr(755,root,root) %{_libdir}/rpm/rpmdb
-%attr(755,root,root) %{_libdir}/rpm/rpmq
-%attr(755,root,root) %{_libdir}/rpm/rpmk
-%attr(755,root,root) %{_libdir}/rpm/rpmv
-%attr(755,root,root) %{_libdir}/librpm*.so.*.*
-%attr(755,root,root) %{_libdir}/rpm/rpmdb
-%attr(755,root,root) %{_libdir}/rpm/rpmq
-%attr(755,root,root) %{_libdir}/rpm/rpmk
-%attr(755,root,root) %{_libdir}/rpm/rpmv
-%attr(755,root,root) %{_libdir}/librpm*.so.*.*
+%files -f %{name}.lang
+%defattr(644,root,root,755)
+%doc RPM-PGP-KEY CHANGES doc/manual/*
+
+%attr(755,root,root) /bin/rpm
 
 %dir %{_sysconfdir}/rpm
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/rpm/macros
@@ -483,13 +570,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/rpm
 %dir %{_libdir}/rpm
 
-%{_libdir}/rpm/macros.python
-%{_libdir}/rpm/noarch-linux
-%{_libdir}/rpm/noarch-pld-linux
-%ifarch i386 i486 i586 i686
+%doc %attr(755,root,root) %{_libdir}/rpm/convertrpmrc.sh
+
+%{_libdir}/rpm/rpmrc
 %{_libdir}/rpm/rpmpopt*
-%{_libdir}/rpm/noarch-linux
-%{_libdir}/rpm/noarch-pld-linux
+%{_libdir}/rpm/macros
+%{_libdir}/rpm/noarch-*
 %ifarch i386 i486 i586 i686 athlon
 %{_libdir}/rpm/i?86*
 %{_libdir}/rpm/athlon*
@@ -502,55 +588,90 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %ifarch ppc
 %{_libdir}/rpm/ppc*
+%endif
+
+%files lib
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/rpmbuild
-%attr(755,root,root) %{_bindir}/rpme
-%attr(755,root,root) %{_bindir}/rpmi
-%attr(755,root,root) %{_bindir}/rpmu
+%attr(755,root,root) %{_libdir}/librpm*-*.so
+
+%files build
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/rpm/compress-doc
+%attr(755,root,root) %{_libdir}/rpm/cross-build
 %attr(755,root,root) %{_libdir}/rpm/find-requires
 %attr(755,root,root) %{_libdir}/rpm/find-provides
 %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/compress-doc
 %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.*
-%attr(755,root,root) %{_libdir}/rpm/rpmi
 %attr(755,root,root) %{_libdir}/rpm/u_pkg.sh
-%attr(755,root,root) %{_libdir}/rpm/rpme
-%attr(755,root,root) %{_libdir}/rpm/rpmu
+%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/rpmi
 %attr(755,root,root) %{_libdir}/rpm/rpmt
-%attr(755,root,root) %{_libdir}/rpm/rpme
-%attr(755,root,root) %{_libdir}/librpm*.la
-%attr(755,root,root) %{_libdir}/librpm*.so
+# not used yet ...
+%{_libdir}/rpm/sql.prov
+%{_libdir}/rpm/sql.req
+%{_libdir}/rpm/tcl.req
+%{_libdir}/rpm/trpm
+
+%attr(755,root,root) %{_bindir}/javadeps
+%attr(755,root,root) %{_bindir}/gendiff
+%attr(755,root,root) %{_bindir}/rpmbuild
+
+%{_mandir}/man1/*
+%{_mandir}/man8/rpmbuild.8*
+
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/rpm
-%attr(755,root,root) %{_libdir}/librpm*.la
-%attr(755,root,root) %{_libdir}/librpm*.so
+%attr(755,root,root) %{_libdir}/librpm.la
+%attr(755,root,root) %{_libdir}/librpm.so
+%attr(755,root,root) %{_libdir}/librpmio.la
+%attr(755,root,root) %{_libdir}/librpmio.so
+%attr(755,root,root) %{_libdir}/librpmdb.la
+%attr(755,root,root) %{_libdir}/librpmdb.so
+%attr(755,root,root) %{_libdir}/librpmbuild.la
+%attr(755,root,root) %{_libdir}/librpmbuild.so
 
 %files static
-%attr(755,root,root) %{_bindir}/*
+%defattr(644,root,root,755)
+%{_libdir}/librpm*.a
+
 %files utils
 %defattr(644,root,root,755)
-%{_mandir}/man1/*
-%attr(755,root,root) %{_bindir}/javadeps
 %attr(755,root,root) %{_bindir}/rpm2cpio
+%attr(755,root,root) %{_libdir}/rpm/rpmdiff*
+%attr(755,root,root) %{_libdir}/rpm/tgpg
+%attr(755,root,root) %{_libdir}/rpm/find-debuginfo.sh
+%attr(755,root,root) %{_bindir}/rpmgraph
+%attr(755,root,root) %{_bindir}/rpmcache
+%attr(755,root,root) %{_bindir}/striptofile
+%attr(755,root,root) %{_bindir}/unstripfile
+# not here
+#%{_prefix}/lib/rpm/rpm.daily
+#%{_prefix}/lib/rpm/rpm.log
+#%{_prefix}/lib/rpm/rpm.xinetd
+%{_prefix}/lib/rpm/rpm2cpio.sh
 
 %{_mandir}/man8/rpm2cpio.8*
-%{_mandir}/man1/*
 %lang(ja) %{_mandir}/ja/man8/rpm2cpio.8*
 %lang(ko) %{_mandir}/ko/man8/rpm2cpio.8*
 %lang(pl) %{_mandir}/pl/man8/rpm2cpio.8*
 %lang(ru) %{_mandir}/ru/man8/rpm2cpio.8*
+%{_mandir}/man8/rpmcache.8*
+%{_mandir}/man8/rpmgraph.8*
 
 %files perlprov
 %defattr(644,root,root,755)
@@ -562,11 +683,33 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/rpm/get_magic.pl
 
 %{_libdir}/rpm/macros.perl
-%files python
+
+%files pythonprov
 %defattr(644,root,root,755)
-%{py_sitedir}/*.so
 %{_libdir}/rpm/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*
+%{_libdir}/rpm/macros.php
+
 %files -n python-rpm
-%defattr(755,root,root,755)
-%{py_sitedir}/*.so
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py_sitedir}/*.so
+%attr(755,root,root) %{py_sitedir}/rpmdb/*.so
+%{py_sitedir}/rpmdb/*.py*
+
+%files -n beecrypt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libbeecrypt.so.*.*
+
+%files -n beecrypt-devel
+%defattr(644,root,root,755)
+%{_prefix}/lib/libbeecrypt.so
+%attr(755,root,root) %{_prefix}/lib/libbeecrypt.la
+%{_includedir}/beecrypt
+
+%files -n beecrypt-static
+%defattr(644,root,root,755)
+%{_prefix}/lib/libbeecrypt.a