X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm.spec;h=8b0c0534dbba1c8a28cb35312f923add67c50500;hp=b5868c7b06b7b503695f5931998caf4167f8845f;hb=609cc5859d3908fc5b4b3c138b3f90c75a57d7a3;hpb=d1ae0589d037f3afd5b34c79ae23c54ae0d65c06

diff --git a/rpm.spec b/rpm.spec
index b5868c7..8b0c053 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,24 +1,20 @@
 # to build for athlon you need release at least 49
 
-Summary:	Red Hat (and now also PLD) Package Manager
-Summary(de):	Red Hat (und jetzt auch PLD) Packet-Manager
+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:	49
+Release:	54.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
 Source1:	%{name}.groups
 Source2:	%{name}.macros
 Source3:	%{name}-install-tree
-Source4:	%{name}-find-%{name}-provides
+Source4:	%{name}-find-rpm-provides
 Source5:	%{name}-macros.perl
 Source6:	%{name}-find-perl-provides
 Source7:	%{name}-find-perl-requires
@@ -60,28 +56,31 @@ Patch28:	%{name}-perlprov-regonly.patch
 Patch29:	%{name}-cxx.patch
 Patch30:	%{name}-athlon.patch
 Patch31:	%{name}-athlon-identify.patch
+Patch32:	%{name}-gettext-in-header.patch
+Patch33:	%{name}-perlprov-perl5.6.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 URL:		http://www.rpm.org/
 Icon:		rpm.gif
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-BuildRequires:	db3-devel >= 3.1.17-9
+BuildRequires:	bzip2-devel >= 1.0.1
 BuildRequires:	db1-devel >= 1.85
 BuildRequires:	db3-devel >= 3.1.17-9
 BuildRequires:	gettext-devel >= 0.10.38-3
-BuildRequires:	python-devel
+BuildRequires:	python-devel >= 2.2
+BuildRequires:	python-modules >= 2.2
 BuildRequires:	zlib-devel
 BuildRequires:	python-modules >= 2.2.1
 BuildRequires:	zlib-devel >= 1.1.4
 %if %{!?_without_static:1}%{?_without_static:0}
 # Require static library only for static build
-BuildRequires:	db3-static >= 3.1.17-9
+BuildRequires:	bzip2-static >= 1.0.1
 BuildRequires:	db1-static >= 1.85
 BuildRequires:	zlib-static
 BuildRequires:	glibc-static >= 2.2.0
 BuildRequires:	zlib-static >= 1.1.4
-Obsoletes:	rpm-libs
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	rpm-libs
 Conflicts:	glibc < 2.2
@@ -135,13 +134,6 @@ 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}
@@ -181,13 +173,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}
@@ -207,8 +192,6 @@ 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}
@@ -225,8 +208,6 @@ 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:	perl-modules
@@ -245,10 +226,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
 
@@ -258,16 +237,16 @@ software.
 
 %description pythonprov -l pl
 Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w
-%package python
+Pythonie.
 
 %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(pt_BR):	Módulo Python para aplicativos que manipulam pacotes RPM
+%requires_eq	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
@@ -275,14 +254,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
+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
@@ -296,8 +275,6 @@ Python para manipular pacotes e bancos de dados RPM.
 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:	%{name} = %{version}
@@ -319,6 +296,7 @@ Requires:	make
 Requires:	patch
 Requires:	popt >= 1.6.2-2
 Requires:	sed
+Requires:	sh-utils
 Requires:	tar
 Requires:	textutils
 
@@ -346,17 +324,19 @@ construir pacotes usando o RPM.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 %patch11 -p0
 %patch12 -p0
-%patch11 -p0
-%patch12 -p0
-%patch15 -p0
-%patch16 -p0
+%patch13 -p1
+%patch14 -p1
 %patch15 -p0
 %patch16 -p0
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
@@ -370,14 +350,15 @@ construir pacotes usando o RPM.
 %ifarch athlon
 %patch31 -p1
 %endif
-%patch31 -p1
+
+%patch35 -p1
 %patch36 -p1
 %patch37 -p1
 %patch38 -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 %{SOURCE6} scripts/find-perl-provides
 install %{SOURCE7} scripts/find-perl-requires
@@ -402,11 +383,15 @@ cd ..
 rm -f missing
 libtoolize --force --copy
 autoconf
-# ugly workaround for automake
+aclocal
+autoupdate
+autoheader || :
+%{__autoconf}
+automake -a -c
 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
+%{__automake}
 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
@@ -415,16 +400,12 @@ 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}|' > macros.tmp
 # 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
+mv -f macros.tmp macros.in
+
 %configure \
 	--enable-shared \
 	--enable-v1-packages \
@@ -473,11 +454,11 @@ rm -rf $RPM_BUILD_ROOT
 %post	-p /sbin/ldconfig
 %postun -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) /bin/rpm
+%attr(755,root,root) %{_bindir}/rpmdb
+%attr(755,root,root) %{_bindir}/rpmquery
+%attr(755,root,root) %{_bindir}/rpmsign
+%attr(755,root,root) %{_bindir}/rpmverify
 %attr(755,root,root) %{_libdir}/rpm/rpmdb
 %attr(755,root,root) %{_libdir}/rpm/rpmq
 %attr(755,root,root) %{_libdir}/rpm/rpmk
@@ -499,8 +480,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/rpm
 
 %{_libdir}/rpm/macros.python
-%{_libdir}/rpm/noarch-linux
-%{_libdir}/rpm/noarch-pld-linux
+%doc %attr(755,root,root) %{_libdir}/rpm/convertrpmrc.sh
+
 %{_libdir}/rpm/rpmrc
 %{_libdir}/rpm/rpmpopt*
 %{_libdir}/rpm/macros
@@ -537,16 +518,16 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/rpm/cpanflute
 %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/rpmdiff*
 %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
+%attr(755,root,root) %{_libdir}/rpm/rpmu
+
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/rpm
@@ -557,7 +538,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/*
 %files utils
 %defattr(644,root,root,755)
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/gendiff
 %attr(755,root,root) %{_bindir}/javadeps
 %attr(755,root,root) %{_bindir}/rpm2cpio
 
@@ -578,9 +559,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/rpm/get_magic.pl
 
 %{_libdir}/rpm/macros.perl
-%files python
+
+%defattr(644,root,root,755)
 %defattr(644,root,root,755)
-%{py_sitedir}/*.so
 %{_libdir}/rpm/macros.python
 
 %files -n python-rpm