X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=f663fde31e4ff489b7b84e555f43ebe0484e5408;hb=be170dd706f91a5acd2d405edec61bab17394ab8;hp=a7c0dab2cb07f966d9126105e6cd77ec39a70ab6;hpb=f1bbc6ff615aee1f68ae6e20dd474af361d453db;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index a7c0dab..f663fde 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,5 +1,7 @@
 #
 # TODO:
+# - update patches
+# - build popt from rpm.spec? (no separate popt-1.10.x tarballs available)
 # - consider using system libmagic not internal libfmagic
 #   (but internal has different method of passing output)
 # - after ac drop amd64 patch and make x86_64 generic arch + subarchs amd64 and ia32e
@@ -20,7 +22,7 @@
 %define	reqdb_ver	4.2.50-1
 %define	reqpopt_ver	1.9
 %define	beecrypt_ver	2:4.1.0
-%define	rpm_macros_rev	1.175
+%define	rpm_macros_rev	1.183
 Summary:	RPM Package Manager
 Summary(de):	RPM Packet-Manager
 Summary(es):	Gestor de paquetes RPM
@@ -29,16 +31,15 @@ Summary(pt_BR):	Gerenciador de pacotes RPM
 Summary(ru):	íÅÎÅÄÖÅÒ ÐÁËÅÔÏ× ÏÔ RPM
 Summary(uk):	íÅÎÅÄÖÅÒ ÐÁËÅÔ¦× ×¦Ä RPM
 Name:		rpm
-%define	ver	4.4
 %define	sover	4.4
-Version:	%{ver}
-Release:	0.%{snap}.0.3
+Version:	4.4.1
+Release:	0.1
 License:	GPL
 Group:		Base
 #Source0:	ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.2.x/%{name}-%{version}.%{snap}.tar.gz
 # Snap tarball is generated from rpm-4_4 branch
-Source0:	ftp://distfiles.pld-linux.org/src/%{name}-%{version}.%{snap}.tar.bz2
-# Source0-md5:	9960ab3e3023b49b42c1e85acef33de5
+Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
+# Source0-md5:	90ded9047b1b69d918c6c7c7b56fd7a9
 Source1:	%{name}.groups
 Source2:	%{name}.platform
 Source3:	%{name}-install-tree
@@ -58,46 +59,46 @@ Source31:	adapter.awk
 Source32:	pldnotify.awk
 # http://svn.pld-linux.org/banner.sh/
 Source33:	banner.sh
+Patch0:		%{name}-pl.po.patch
 Patch1:		%{name}-rpmrc.patch
 Patch2:		%{name}-arch.patch
 Patch3:		%{name}-rpmpopt.patch
 Patch4:		%{name}-perl-macros.patch
 Patch5:		%{name}-perl-req-perlfile.patch
-Patch7:		%{name}-noexpand.patch
-Patch8:		%{name}-scripts-closefds.patch
-Patch9:		%{name}-python-macros.patch
-Patch10:	%{name}-gettext-in-header.patch
-Patch11:	%{name}-compress-doc.patch
-Patch12:	%{name}-build.patch
-Patch13:	%{name}-system_libs.patch
-Patch14:	%{name}-bb-and-short-circuit.patch
-Patch15:	%{name}-etc_dir.patch
-Patch16:	%{name}-system_libs-more.patch
-Patch17:	%{name}-php-deps.patch
-Patch19:	%{name}-ldconfig-always.patch
-Patch20:	%{name}-perl_req.patch
-Patch21:	%{name}-no-bin-env.patch
-Patch22:	%{name}-magic-usesystem.patch
-Patch23:	%{name}-dontneedutils.patch
-Patch24:	%{name}-provides-dont-obsolete.patch
-Patch25:	%{name}-examplesaredoc.patch
-Patch26:	%{name}-po.patch
-Patch27:	%{name}-amd64.patch
-Patch28:	%{name}-notsc.patch
-Patch29:	%{name}-hack-norpmlibdep.patch
-Patch30:	%{name}-makefile-no_myLDADD_deps.patch
-Patch31:	%{name}-libdir64.patch
-Patch32:	%{name}-libdir-links.patch
-Patch35:	%{name}-missing-prototypes.patch
-Patch36:	%{name}-pld-autodep.patch
-Patch37:	%{name}-rpmsq.patch
-Patch40:	%{name}-epoch0.patch
-Patch43:	%{name}-perl_req-INC_dirs.patch
-Patch44:	%{name}-debuginfo.patch
-Patch45:	%{name}-beecrypt4.patch
-Patch46:	%{name}-doxygen_hack.patch
-Patch47:	%{name}-distver.patch
-Patch100:	%{name}-pl.po.patch
+Patch6:		%{name}-noexpand.patch
+Patch7:		%{name}-scripts-closefds.patch
+Patch8:		%{name}-python-macros.patch
+Patch9:		%{name}-gettext-in-header.patch
+Patch10:	%{name}-compress-doc.patch
+Patch11:	%{name}-build.patch
+Patch12:	%{name}-system_libs.patch
+Patch13:	%{name}-bb-and-short-circuit.patch
+Patch14:	%{name}-etc_dir.patch
+Patch15:	%{name}-system_libs-more.patch
+Patch16:	%{name}-php-deps.patch
+Patch17:	%{name}-ldconfig-always.patch
+Patch18:	%{name}-perl_req.patch
+Patch19:	%{name}-no-bin-env.patch
+Patch20:	%{name}-magic-usesystem.patch
+Patch21:	%{name}-dontneedutils.patch
+Patch22:	%{name}-provides-dont-obsolete.patch
+Patch23:	%{name}-examplesaredoc.patch
+Patch24:	%{name}-po.patch
+Patch25:	%{name}-amd64.patch
+Patch26:	%{name}-notsc.patch
+Patch27:	%{name}-hack-norpmlibdep.patch
+Patch28:	%{name}-makefile-no_myLDADD_deps.patch
+Patch29:	%{name}-libdir64.patch
+Patch30:	%{name}-libdir-links.patch
+Patch31:	%{name}-missing-prototypes.patch
+Patch32:	%{name}-pld-autodep.patch
+Patch33:	%{name}-rpmsq.patch
+Patch34:	%{name}-epoch0.patch
+Patch35:	%{name}-perl_req-INC_dirs.patch
+Patch36:	%{name}-debuginfo.patch
+Patch37:	%{name}-doxygen_hack.patch
+Patch38:	%{name}-distver.patch
+Patch39:	%{name}-gcc4.patch
 URL:		http://www.rpm.org/
 Icon:		rpm.gif
 BuildRequires:	autoconf >= 2.52
@@ -110,7 +111,7 @@ BuildRequires:	elfutils-devel
 BuildRequires:	findutils
 BuildRequires:	gettext-devel >= 0.11.4-2
 #BuildRequires:	libmagic-devel
-%{?with_selinux:BuildRequires:	libselinux-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
@@ -132,7 +133,7 @@ BuildRequires:	db-static >= %{reqdb_ver}
 BuildRequires:	glibc-static >= 2.2.94
 BuildRequires:	elfutils-static
 #BuildRequires:	libmagic-static
-%{?with_selinux:BuildRequires:	libselinux-static}
+%{?with_selinux:BuildRequires:	libselinux-static >= 1.18}
 BuildRequires:	popt-static >= %{reqpopt_ver}
 BuildRequires:	zlib-static
 %endif
@@ -208,6 +209,23 @@ RPM - 
 ÓÌÕÖÂÏ×ϧ ¦ÎÆÏÒÍÁæ§, ÝÏ Í¦ÓÔÉÔØ ÎÁÚ×Õ, ×ÅÒÓ¦À, ÏÐÉÓ ÔÁ ¦ÎÛÕ
 ¦ÎÆÏÒÍÁæÀ ÐÒÏ ÐÁËÅÔ.
 
+%package lib
+Summary:	RPMs library
+Summary(pl):	Biblioteki RPM-a
+Group:		Libraries
+Requires:	db >= %{reqdb_ver}
+%{?with_selinux:BuildRequires:	libselinux >= 1.18}
+Requires:	popt >= %{reqpopt_ver}
+%{?with_distver:Provides:	rpm-lib(distver)}
+# avoid SEGV caused by mixed db versions
+Conflicts:	poldek < 0.18.1-16
+
+%description lib
+RPMs library.
+
+%description lib -l pl
+Biblioteki RPM-a.
+
 %package devel
 Summary:	Header files for rpm libraries
 Summary(de):	Header-Dateien für rpm Libraries
@@ -362,103 +380,6 @@ Aktualnie pakiet zawiera binark
 uaktualniania lub usuwania pakietów bez udzia³u bibliotek statycznych
 (z wyj±tkiem modu³ów NSS).
 
-%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
-Summary(pl):	Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
-Group:		Applications/File
-Requires:	%{name} = %{version}-%{release}
-Requires:	perl-devel
-Requires:	perl-modules
-
-%description perlprov
-Additional utilities for checking perl provides/requires in rpm
-packages.
-
-%description perlprov -l de
-Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen.
-
-%description perlprov -l pl
-Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w
-pakietach rpm.
-
-%package pythonprov
-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}-%{release}
-Requires:	python-modules
-
-%description pythonprov
-Python macros, which simplifies creation of rpm packages with Python
-software.
-
-%description pythonprov -l pl
-Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w
-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}-%{release}
-
-%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
-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}-%{release}
-%pyrequires_eq	python
-Obsoletes:	rpm-python
-
-%description -n python-rpm
-The rpm-python package contains a module which permits applications
-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
-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
-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
-escritas em Python utilizem a interface fornecida pelas bibliotecas
-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 RPM-a
-Group:		Libraries
-Requires:	db >= %{reqdb_ver}
-Requires:	popt >= %{reqpopt_ver}
-%{?with_distver:Provides:	rpm-lib(distver)}
-# avoid SEGV caused by mixed db versions
-Conflicts:	poldek < 0.18.1-16
-
-%description lib
-RPMs library.
-
-%description lib -l pl
-Biblioteki RPM-a.
-
 %package build
 Summary:	Scripts for building binary RPM packages
 Summary(de):	Scripts fürs Bauen binärer RPM-Pakete
@@ -472,6 +393,7 @@ Requires:	%{name}-utils = %{version}-%{release}
 Requires:	/bin/id
 Requires:	awk
 Requires:	binutils
+Requires:	bzip2
 Requires:	chrpath >= 0.10-4
 Requires:	cpio
 Requires:	diffutils
@@ -482,8 +404,13 @@ Requires:	findutils
 %ifarch athlon
 Requires:	gcc >= 3.0.3
 %else
+%ifarch i686
+# because of -mtune in rpmrc
+Requires:	gcc >= 5:3.4
+%else
 Requires:	gcc
 %endif
+%endif
 Requires:	glibc-devel
 Requires:	grep
 Requires:	gzip
@@ -496,6 +423,8 @@ Requires:	tar
 Requires:	textutils
 Provides:	rpmbuild(macros) = %{rpm_macros_rev}
 Provides:	rpmbuild(noauto) = 3
+# because of -fvisibility-inlines-hidden in rpm.macros
+Conflicts:	gcc-c++ < 5:3.4
 %ifarch amd64
 Conflicts:	automake < 1:1.7.9-2
 Conflicts:	libtool < 2:1.5-13
@@ -556,29 +485,109 @@ construir pacotes usando o RPM.
 ò¦ÚÎÏÍÁΦÔΦ ÄÏÐÏͦÖΦ ÓËÒÉÐÔÉ ÔÁ ÕÔÉ̦ÔÉ, Ñ˦ ×ÉËÏÒÉÓÔÏ×ÕÀÔØÓÑ ÄÌÑ
 ÐÏÂÕÄÏ×É RPM'¦×.
 
-%if %{with apidocs}
-%package	apidocs
-Summary:	rpm API documentation and guides
-Summary(pl):	Documentacja API rpm i przewodniki.
+%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
+Summary(pl):	Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
+Group:		Applications/File
+Requires:	%{name} = %{version}-%{release}
+Requires:	perl-devel
+Requires:	perl-modules
+
+%description perlprov
+Additional utilities for checking perl provides/requires in rpm
+packages.
+
+%description perlprov -l de
+Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen.
+
+%description perlprov -l pl
+Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w
+pakietach rpm.
+
+%package pythonprov
+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}-%{release}
+Requires:	python-modules
+
+%description pythonprov
+Python macros, which simplifies creation of rpm packages with Python
+software.
+
+%description pythonprov -l pl
+Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w
+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}-%{release}
+
+%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
+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}-%{release}
+%pyrequires_eq	python
+Obsoletes:	rpm-python
+
+%description -n python-rpm
+The rpm-python package contains a module which permits applications
+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
+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
+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
+escritas em Python utilizem a interface fornecida pelas bibliotecas
+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 apidocs
+Summary:	RPM API documentation and guides
+Summary(pl):	Documentacja API RPM-a i przewodniki
 Group:		Documentation	
 
 %description apidocs
-Documentation for rpm API and guides in html format generated
+Documentation for RPM API and guides in HTML format generated
 from rpm sources by doxygen.
 
 %description apidocs -l pl
-Dokumentacja API rpm oraz przewodniki w formacie html generowana
-ze ¼rode³ rpm przez doxygen.
-%endif
+Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane
+ze ¼rode³ RPM-a przez doxygen.
 
 %prep
 %setup -q -n %{name}
 %patch1 -p1
 %patch2 -p1
-# temporarily moved after patch100 - messes too much in pl.po
+# temporarily moved after patch0 - messes too much in pl.po
 #%patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -586,14 +595,13 @@ ze 
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 # home-etc FIXME
-#%patch15 -p1
+#%patch14 -p1
+%patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 %patch19 -p1
-%patch20 -p1
-%patch21 -p1
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
 echo '%%define	__perl_provides	%%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
@@ -606,6 +614,8 @@ install %{SOURCE9} scripts/php.prov.in
 install %{SOURCE10} scripts/php.req.in
 install %{SOURCE12} scripts/perl.prov
 cat %{SOURCE11} >> macros.in
+%patch20 -p1
+%patch21 -p1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
@@ -617,19 +627,14 @@ cat %{SOURCE11} >> macros.in
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
-%patch35 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p0
 %patch36 -p1
 %patch37 -p1
-%patch40 -p1
-%patch43 -p0
-%patch44 -p1
-# OBSOLETE
-#%patch45 -p1
-# NEEDS UPDATE
-# %patch46 -p1
-%{?with_distver:%patch47 -p1}
-# NEEDS UPDATE
-#%patch100 -p1
+%{?with_distver:%patch38 -p1}
+%patch39 -p1
+%patch0 -p1
 %patch3 -p1
 
 cd scripts;
@@ -840,6 +845,9 @@ for a in librpm-%{sover}.so librpmdb-%{sover}.so librpmio-%{sover}.so ; do
 	ln -s /%{_lib}/$a $RPM_BUILD_ROOT%{_libdir}/$a
 done
 
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+
 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
@@ -905,6 +913,63 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %attr(755,root,root) /%{_lib}/librpm*-*.so
 %attr(755,root,root) %{_libdir}/librpm*-*.so
 
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/rpm
+%{_libdir}/librpm*.la
+%attr(755,root,root) %{_libdir}/librpm.so
+%attr(755,root,root) %{_libdir}/librpm-%{sover}.so
+%attr(755,root,root) %{_libdir}/librpmio.so
+%attr(755,root,root) %{_libdir}/librpmio-%{sover}.so
+%attr(755,root,root) %{_libdir}/librpmdb.so
+%attr(755,root,root) %{_libdir}/librpmdb-%{sover}.so
+%attr(755,root,root) %{_libdir}/librpmbuild.so
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/librpm*.a
+
+%files utils
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/debugedit
+%attr(755,root,root) %{_bindir}/rpm2cpio
+%attr(755,root,root) %{_bindir}/rpmcache
+%attr(755,root,root) %{_bindir}/rpmdeps
+%attr(755,root,root) %{_bindir}/rpmgraph
+%attr(755,root,root) %{_bindir}/rpmfile
+%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
+%{_mandir}/man8/rpm2cpio.8*
+%{_mandir}/man8/rpmdeps.8*
+%{_mandir}/man8/rpmcache.8*
+%{_mandir}/man8/rpmgraph.8*
+%lang(ja) %{_mandir}/ja/man8/rpm2cpio.8*
+%lang(ja) %{_mandir}/ja/man8/rpmcache.8*
+%lang(ja) %{_mandir}/ja/man8/rpmgraph.8*
+%lang(ko) %{_mandir}/ko/man8/rpm2cpio.8*
+%lang(pl) %{_mandir}/pl/man8/rpm2cpio.8*
+%lang(pl) %{_mandir}/pl/man8/rpmdeps.8*
+%lang(pl) %{_mandir}/pl/man8/rpmcache.8*
+%lang(pl) %{_mandir}/pl/man8/rpmgraph.8*
+%lang(ru) %{_mandir}/ru/man8/rpm2cpio.8*
+
+%files utils-perl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_rpmlibdir}/rpmdiff*
+# not here
+#%%{_rpmlibdir}/rpm.daily
+#%%{_rpmlibdir}/rpm.log
+#%%{_rpmlibdir}/rpm.xinetd
+
+%if %{with static}
+%files utils-static
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/rpm[ieu]
+%attr(755,root,root) %{_rpmlibdir}/rpm[ieu]
+%endif
+
 %files build
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/rpm/noauto*
@@ -978,63 +1043,11 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %lang(pl) %{_mandir}/pl/man1/gendiff.1*
 %lang(pl) %{_mandir}/pl/man8/rpmbuild.8*
 
-%files devel
-%defattr(644,root,root,755)
-%{_includedir}/rpm
-%{_libdir}/librpm*.la
-%attr(755,root,root) %{_libdir}/librpm.so
-%attr(755,root,root) %{_libdir}/librpm-*.so
-%attr(755,root,root) %{_libdir}/librpmio.so
-%attr(755,root,root) %{_libdir}/librpmio-*.so
-%attr(755,root,root) %{_libdir}/librpmdb.so
-%attr(755,root,root) %{_libdir}/librpmdb-*.so
-%attr(755,root,root) %{_libdir}/librpmbuild.so
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/librpm*.a
-
-%files utils
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/debugedit
-%attr(755,root,root) %{_bindir}/rpm2cpio
-%attr(755,root,root) %{_bindir}/rpmcache
-%attr(755,root,root) %{_bindir}/rpmdeps
-%attr(755,root,root) %{_bindir}/rpmgraph
-%attr(755,root,root) %{_bindir}/rpmfile
-%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
-%{_mandir}/man8/rpm2cpio.8*
-%{_mandir}/man8/rpmdeps.8*
-%{_mandir}/man8/rpmcache.8*
-%{_mandir}/man8/rpmgraph.8*
-%lang(ja) %{_mandir}/ja/man8/rpm2cpio.8*
-%lang(ja) %{_mandir}/ja/man8/rpmcache.8*
-%lang(ja) %{_mandir}/ja/man8/rpmgraph.8*
-%lang(ko) %{_mandir}/ko/man8/rpm2cpio.8*
-%lang(pl) %{_mandir}/pl/man8/rpm2cpio.8*
-%lang(pl) %{_mandir}/pl/man8/rpmdeps.8*
-%lang(pl) %{_mandir}/pl/man8/rpmcache.8*
-%lang(pl) %{_mandir}/pl/man8/rpmgraph.8*
-%lang(ru) %{_mandir}/ru/man8/rpm2cpio.8*
-
-%files utils-perl
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_rpmlibdir}/rpmdiff*
-# not here
-#%%{_rpmlibdir}/rpm.daily
-#%%{_rpmlibdir}/rpm.log
-#%%{_rpmlibdir}/rpm.xinetd
-
-
-%if %{with static}
-%files utils-static
+%files build-tools
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/rpm[ieu]
-%attr(755,root,root) %{_rpmlibdir}/rpm[ieu]
-%endif
+%attr(755,root,root) %{_bindir}/builder
+%attr(755,root,root) %{_bindir}/adapter.awk
+%attr(755,root,root) %{_bindir}/pldnotify.awk
 
 %files perlprov
 %defattr(644,root,root,755)
@@ -1059,16 +1072,12 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %files -n python-rpm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py_sitedir}/*.so
+%attr(755,root,root) %{py_sitedir}/rpm/*.so
+%attr(755,root,root) %{py_sitedir}/rpm/*.py[co]
 %attr(755,root,root) %{py_sitedir}/rpmdb/*.so
 %{py_sitedir}/rpmdb/*.py*
 %endif
 
-%files build-tools
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/builder
-%attr(755,root,root) %{_bindir}/adapter.awk
-%attr(755,root,root) %{_bindir}/pldnotify.awk
-
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)