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

diff --git a/rpm.spec b/rpm.spec
index 1617c81..8b0c053 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,15 +1,15 @@
-Summary:	Red Hat (and now also PLD) Package Manager
-Summary(de):	Red Hat (und jetzt auch PLD) Packet-Manager
-Summary(pl):	Aplikacja do zarz±dzania pakietami
+# to build for athlon you need release at least 49
+
+Summary:	RPM Package Manager
+Summary(de):	RPM Packet-Manager
+Summary(es):	Gestor de paquetes RPM
+Summary(pl):	Aplikacja do zarz±dzania pakietami RPM
+Summary(pt_BR):	Gerenciador de pacotes RPM
 Name:		rpm
 Version:	4.0.2
-Release:	38
+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
@@ -22,7 +22,8 @@ Source8:	%{name}-find-spec-bcond
 Source9:	%{name}-find-lang
 Source10:	%{name}-find-provides
 Source11:	%{name}-find-requires
-Source12:	%{name}-non-english-man-pages.tar.gz
+Source12:	%{name}-non-english-man-pages.tar.bz2
+Source13:	%{name}-macros.python
 Patch0:		%{name}-rpmrc.patch
 Patch1:		%{name}-macros.patch
 Patch2:		%{name}-arch.patch
@@ -48,38 +49,48 @@ 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
+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
-BuildRequires:	gettext-devel >= 0.10.38-3
+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:	zlib-devel
+BuildRequires:	db1-devel >= 1.85
+BuildRequires:	db3-devel >= 3.1.17-9
 BuildRequires:	gettext-devel >= 0.10.38-3
-BuildRequires:	libtool
-BuildRequires:	automake
-BuildRequires:	autoconf >= 2.50
-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
-%endif
 BuildRequires:	zlib-static >= 1.1.4
-Obsoletes:	rpm-libs
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	rpm-libs
-%define __find_provides %{SOURCE4}
-%define _binary_payload w9.gzdio
+Conflicts:	glibc < 2.2
+
 %define		__find_provides	%{SOURCE4}
-%define python_prefix      %(echo `python -c "import sys; print sys.prefix"`)
-%define python_version     %(echo `python -c "import sys; print sys.version[:3]"`)
-%define python_includedir  %{_includedir}/python%{python_version}
-%define python_libdir      %{python_prefix}/lib/python%{python_version}
-%define python_sitedir     %{python_libdir}/site-packages
+%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, '.')"`)
 
@@ -94,6 +105,13 @@ RPM ist ein kr
 Installation, Anfrage, Verifizierung, Aktualisierung und
 Uninstallation individueller Softwarepakete. Ein Paket besteht aus
 einem Archiv Dateien und Paketinformation, inklusive Name, Version und
+Beschreibung.
+
+%description -l es
+RPM es un poderoso administrador de paquetes, que puede ser usado para
+construir, instalar, pesquisar, verificar, actualizar y desinstalar
+paquetes individuales de software. Un paquete consiste en un
+almacenaje de archivos, y información sobre el paquete, incluyendo
 nombre, versión y descripción.
 
 %description -l pl
@@ -102,18 +120,20 @@ przebudowa
 dotycz±ce ka¿dego pakietu, takie jak jego opis, lista plików
 wchodz±cych w sk³ad pakietu, zale¿no¶ci od innych pakietów, s±
 przechowywane w bazie danych i mo¿na je uzyskaæ za pomoc± opcji
+odpytywania programu rpm.
+
+%description -l pt_BR
+RPM é um poderoso gerenciador de pacotes, que pode ser usado para
+construir, instalar, pesquisar, verificar, atualizar e desinstalar
+pacotes individuais de software. Um pacote consiste de um conjunto de
+arquivos e informações adicionais, incluindo nome, versão e descrição
 do pacote, permissões dos arquivos, etc.
 
 %package devel
-Summary(pl):	Pliki nag³ówkowe i biblioteki statyczne	
+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}
@@ -129,21 +149,30 @@ intimate knowledge of RPM packages.
 Der RPM-Packensystem enthält eine C-Library, die macht es einfach
 RPM-Pakete und Dateibanken zu manipulieren. Er eignet sich für
 Vereinfachung des Schaffens grafischer Paket-Manager und anderer
+Werkzeuge, die intime Kenntnis von RPM-Paketen brauchen.
+
+%description devel -l es
+El sistema de empaquetado RPM incluye una biblioteca C que vuelve
+fácil la manipulación de paquetes y bases de datos RPM. Su objetivo es
+facilitar la creación de administradores gráficos de paquetes y otras
 herramientas que necesiten un conocimiento profundo de paquetes RPM.
-Pliki nag³ówkowe i biblioteki statyczne.
+
+%description devel -l pl
+System RPM zawiera bibliotekê C, która u³atwia manipulowanie pakietami
+RPM oraz bazami danych. W zamiarze ma to upro¶ciæ tworzenie
 graficznych mened¿erów pakietów oraz innych narzêdzi, które wymagaj±
+szczegó³owej wiedzy na temat pakietów RPM.
+
+%description devel -l pt_BR
+O sistema de empacotamento RPM inclui uma biblioteca C que torna fácil
+a manipulação de pacotes e bases de dados RPM. Seu objetivo é
+facilitar a criação de gerenciadores gráficos de pacotes e outras
 ferramentas que precisem de conhecimento profundo de pacotes RPM.
 
 %package static
-Summary(pl):	Biblioteki statyczne rpm-a
+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}
@@ -153,15 +182,16 @@ RPM static libraries.
 
 %description static -l de
 RPMs statische Libraries.
-Biblioteki statyczne rpm-a.
+
 %description static -l pl
+Biblioteki statyczne RPM-a.
+
+%description static -l pt_BR
 Bibliotecas estáticas para desenvolvimento.
 
 %package utils
-Summary(pl):	Dodatkowe narzêdzia do zarz±dzania baz± rpm-a i pakietami
+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}
@@ -171,15 +201,13 @@ Additional utilities for managing rpm packages and database.
 
 %description utils -l de
 Zusatzwerkzeuge für Verwaltung RPM-Pakete und Datenbanken.
-Dodatkowe narzêdzia do zarz±dzania baz± rpm-a i pakietami.
+
 %description utils -l pl
 Dodatkowe narzêdzia do zarz±dzania baz± RPM-a i pakietami.
 
 %package perlprov
-Summary(pl):	Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci dla skryptów perl w pakietach rpm
+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
@@ -191,17 +219,34 @@ packages.
 
 %description perlprov -l de
 Zusatzwerkzeuge fürs Nachsehen Perl-Abhängigkeiten in RPM-Paketen.
-Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci dla skryptów perl w
+
 %description perlprov -l pl
 Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w
-%package python
+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}
+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 -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
@@ -209,29 +254,49 @@ 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 build
-Summary(pl):	Skrypty pomocnicze do budowania binarnych RPMów
+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:	sh-utils
+Requires:	%{name} = %{version}
+Requires:	/bin/id
+Requires:	awk
 Requires:	binutils
-Requires:	patch
-Requires:	texinfo
+Requires:	diffutils
 Requires:	file >= 3.31
-Requires:	binutils
-Requires:	make
+Requires:	fileutils
+Requires:	findutils
+%ifarch athlon
 Requires:	gcc >= 3.0.3
+%else
 Requires:	gcc
-Requires:	diffutils
 Requires:	glibc-devel
-Requires:	sed
-Requires:	sed
+Requires:	grep
+Requires:	gzip
+Requires:	make
+Requires:	patch
 Requires:	popt >= 1.6.2-2
+Requires:	sed
+Requires:	sh-utils
 Requires:	tar
 Requires:	textutils
 
@@ -240,8 +305,12 @@ Scripts for building binary RPM packages.
 
 %description build -l de
 Scripts fürs Bauen binärer RPM-Pakete.
-Skrypty pomocnicze do budowania binarnych RPMów.
+
 %description build -l pl
+Skrypty pomocnicze do budowania binarnych RPM-ów.
+
+%description build -l pt_BR
+Este pacote contém scripts e programas executáveis que são usados para
 construir pacotes usando o RPM.
 
 %prep
@@ -255,27 +324,41 @@ 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
+%patch25 -p1
+%patch26 -p0
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+
+%ifarch athlon
 %patch31 -p1
+%endif
+
+%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
@@ -285,6 +368,7 @@ install %{SOURCE9} scripts/find-lang.sh
 mv -f perl.req perl.req.in
 mv -f perl.prov perl.prov.in)
 %build
+# generate Group translations to *.po
 awk -f %{SOURCE14} %{SOURCE1}
 
 cd popt
@@ -292,40 +376,49 @@ autoconf
 automake -a -c
 aclocal
 autoheader
+automake -a -c -f
 %{__automake}
 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
 
-sed -e 's#python1.5#python%{python_version}#g' \
+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
 
+# 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 \
 	--with-python
 
 
 %{__make} %{?_without_static:rpm_LDFLAGS="\\$(myLDFLAGS)"}
 
-	DESTDIR="$RPM_BUILD_ROOT" \
+%install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
 	pkgbindir="%{_bindir}"
 
 install macros.perl $RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
@@ -361,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
@@ -386,10 +479,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/lib/rpm
 %dir %{_libdir}/rpm
 
-%{_libdir}/rpm/noarch-linux
-%{_libdir}/rpm/noarch-pld-linux
-%ifarch i386 i486 i586 i686
+%{_libdir}/rpm/macros.python
+%doc %attr(755,root,root) %{_libdir}/rpm/convertrpmrc.sh
+
+%{_libdir}/rpm/rpmrc
 %{_libdir}/rpm/rpmpopt*
+%{_libdir}/rpm/macros
 %{_libdir}/rpm/noarch-linux
 %{_libdir}/rpm/noarch-pld-linux
 %ifarch i386 i486 i586 i686 athlon
@@ -397,6 +492,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/rpm/athlon*
 %endif
 %ifarch sparc sparc64
+%{_libdir}/rpm/sparc*
+%endif
+%ifarch alpha
+%{_libdir}/rpm/alpha*
 %endif
 %ifarch ppc
 %{_libdir}/rpm/ppc*
@@ -419,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
@@ -439,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
 
@@ -456,11 +555,15 @@ rm -rf $RPM_BUILD_ROOT
 %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
-%files python
+%attr(755,root,root) %{_libdir}/rpm/find-req.pl
+%attr(755,root,root) %{_libdir}/rpm/get_magic.pl
+
+%{_libdir}/rpm/macros.perl
+
+%defattr(644,root,root,755)
 %defattr(644,root,root,755)
-%{python_sitedir}/*.so
 %{_libdir}/rpm/macros.python
 
 %files -n python-rpm
-* %{date} PLD Team <pld-list@pld.org.pl>
+%defattr(755,root,root,755)
 %{py_sitedir}/*.so