X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=5c74e551afeeb1679c9ee8414aadb3f114db6e14;hb=9805fd6d6c1a0421d7ef2cdf811fc6603e7caa88;hp=21a2310d0c937b8da59fc49a7d6b427cb6fda41a;hpb=0ba3bb481a94898f0d5931c966382c0fb642f8fa;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index 21a2310..5c74e55 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -3,11 +3,13 @@ Summary(de):	Red Hat (und jetzt auch PLD) Packet-Manager
 Summary(pl):	Aplikacja do zarz±dzania pakietami
 Name:		rpm
 Version:	4.0.2
-Release:	37
+Release:	43
 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
@@ -20,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
@@ -35,7 +38,7 @@ Patch10:	%{name}-cache.patch
 Patch11:	%{name}-suggestions.patch
 Patch12:	%{name}-rh-lame.patch
 Patch13:	%{name}-glob.patch
-Patch14:	%{name}-header_h.patch	
+Patch14:	%{name}-header_h.patch
 Patch15:	%{name}-fast-alAddPackage.patch
 Patch16:	%{name}-byKey.patch
 Patch17:	%{name}-perlprov.patch
@@ -45,6 +48,9 @@ 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
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 BuildRequires:	gettext-devel >= 0.10.38-3
@@ -102,11 +108,15 @@ przechowywane w bazie danych i mo
 do pacote, permissões dos arquivos, etc.
 
 %package devel
-Summary(pl):	Pliki nag³ówkowe i biblioteki statyczne	
+Summary(de):	Header-Dateien uns Libraries
 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}
@@ -131,8 +141,12 @@ ferramentas que precisem de conhecimento profundo de pacotes RPM.
 Summary(pl):	Biblioteki statyczne rpm-a
 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}
@@ -183,6 +197,21 @@ Zusatzwerkzeuge f
 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
+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
+Requires:	%{name} = %{version}
+Requires:	python-modules
+Python macros, which simplifies creation of rpm packages with Python software.
+Python macros, which simplifies creation of rpm packages with Python
+software.
+Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w Pythonie.
+Makra u³atwiaj±ce tworzenie pakietów rpm z programami napisanymi w
 %package python
 
 Group:		Development/Languages/Python
@@ -210,9 +239,9 @@ Group:		Applications/File
 Requires:	sh-utils
 Requires:	binutils
 Requires:	patch
-Requires:	texinfo
 Requires:	file >= 3.31
 Requires:	binutils
+Requires:	make
 Requires:	gcc >= 3.0.3
 Requires:	gcc
 Requires:	diffutils
@@ -224,10 +253,10 @@ Requires:	tar
 Requires:	textutils
 
 %description build
-%description -l de build
+Scripts for building binary RPM packages.
 
 %description build -l de
-%description -l pl build
+Scripts fürs Bauen binärer RPM-Pakete.
 Skrypty pomocnicze do budowania binarnych RPMów.
 %description build -l pl
 construir pacotes usando o RPM.
@@ -256,10 +285,14 @@ construir pacotes usando o RPM.
 %patch19 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p0
 %patch31 -p1
 %patch36 -p1
-cp platform.in macros.pld.in
+%patch37 -p1
 %patch38 -p1
+
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
 install %{SOURCE9} scripts/find-lang.sh
@@ -313,6 +346,7 @@ sed -e 's|@host@|%{_target_cpu}-%{_target_vendor}-linux-gnu|' macros.in | \
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT \
 	pkgbindir="%{_bindir}"
 
 install macros.perl $RPM_BUILD_ROOT%{_libdir}/rpm/macros.perl
@@ -337,12 +371,12 @@ EOF
 
 %find_lang %{name}
 
+# DON'T BREAK BUILD TREE!!!
+# rm -f doc/manual/Makefile*
+
 gzip -9nf RPM-PGP-KEY CHANGES doc/manual/*
 
 %clean
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
@@ -373,6 +407,7 @@ 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
@@ -443,6 +478,10 @@ 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
+%attr(755,root,root) %{_libdir}/rpm/find-req.pl
+%attr(755,root,root) %{_libdir}/rpm/get_magic.pl
+
+%{_libdir}/rpm/macros.perl
 %files python
 %defattr(644,root,root,755)
 %{python_sitedir}/*.so