X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm.spec;h=d4f2f62a567f2edb1b1719755e25f208737c3573;hb=25e2cf209eac8bd0c7d589648764de0f24c963b8;hp=092153223c7aab853d8e62f4830b72617093f789;hpb=9a3baa32b96c7eb945b312af93680979be8e2e21;p=packages%2Frpm.git

diff --git a/rpm.spec b/rpm.spec
index 0921532..d4f2f62 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -2,7 +2,7 @@ Summary:	Red Hat (and now also PLD) Package Manager
 Summary(pl):	Aplikacja do zarz±dzania pakietami
 Name:		rpm
 Version:	4.0.2
-Release:	0.1
+Release:	1
 Group:		Base
 Group(de):	Gründsätzlich
 Group(pl):	Podstawowe
@@ -16,6 +16,7 @@ Source5:	%{name}-macros.perl
 Source6:	%{name}-find-perl-provides
 Source7:	%{name}-find-perl-requires
 Source8:	%{name}-find-spec-bcond
+Source9:	%{name}-find-lang
 Patch0:		%{name}-rpmrc.patch
 Patch1:		%{name}-find-requires.patch
 Patch2:		%{name}-macros.patch
@@ -33,8 +34,7 @@ Patch12:	%{name}-segv.patch
 Patch14:	%{name}-am_fix.patch
 Patch15:	%{name}-perl-req-perlfile.patch
 Patch16:	%{name}-installplatform.patch
-Patch17:	%{name}-find-lang.patch
-Patch18:	%{name}-cache.patch
+Patch17:	%{name}-cache.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 BuildRequires:	gettext-devel
@@ -80,6 +80,7 @@ Summary:	RPM shared libraries
 Summary(pl):	Biblioteki wspó³dzielone rpm-a
 Group:		Libraries
 Group(de):	Libraries
+Group(es):	Bibliotecas
 Group(fr):	Librairies
 Group(pl):	Biblioteki
 Requires:	%{name} = %{version}
@@ -147,7 +148,8 @@ Group(pl):	Aplikacje/Pliki
 Summary(pl):	Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci skryptów perla w pakietach rpm
 Requires:	perl-modules
 Requires:	findutils
-Additional utilities for checking perl provides/requires in rpm packages.
+
+%description perlprov
 Additional utilities for checking perl provides/requires in rpm
 %description -l pl perlprov
 Dodatkowe narzêdzia do sprawdzenia zale¿no¶ci dla skryptów perl w
@@ -169,6 +171,7 @@ Requires:	file >= 3.31
 Requires:	binutils
 Requires:	gcc >= 3.0.3
 Requires:	gcc
+Requires:	diffutils
 Requires:	tar
 Requires:	textutils
 
@@ -196,12 +199,12 @@ construir pacotes usando o RPM.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p1
 %patch31 -p1
 install %{SOURCE2} macros.pld.in
 %patch38 -p1
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 cp -f platform.in macros.pld.in
+install %{SOURCE9} scripts/find-lang.sh
 install %{SOURCE13} macros.python.in
 (cd scripts; 
 install %{SOURCE7} scripts/find-perl-requires
@@ -225,16 +228,18 @@ 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 lib/Makefile.am.new lib/Makefile.am
+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 lib/Makefile.in.new lib/Makefile.in
+mv -f lib/Makefile.in.new lib/Makefile.in
 %configure \
 	sed 's|@host_cpu@|%{_target_cpu}|' > macros.tmp
 	--enable-v1-packages
 %configure \
 %{__make} %{?bcond_off_static:rpm_LDFLAGS="\\$(myLDFLAGS)"}
+sed -e 's/#include <rpmio\.h>/#include <rpm\/rpmio\.h>/g' lib/header.h > lib/header.h.new
+mv -f lib/header.h.new lib/header.h
 	--with-python
 
 
@@ -314,7 +319,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/rpm/alpha-pld-linux
 %ifarch sparc sparc64
 %endif
-
 %ifarch ppc
 %{_libdir}/rpm/ppc*
 %defattr(644,root,root,755)