update macros.pld for autoconf 2.50; fixes for ac 2.50; popt fixes

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 10cc2a3c84ffef12ced8b0218257592a0fb33ae1..080dc81bcbe07f18bead056c268e93a1991399a7 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -3,7 +3,7 @@ Summary(de):    Red Hat (und jetzt auch PLD) Packet-Manager
 Summary(pl):   Aplikacja do zarz±dzania pakietami
 Name:          rpm
 Version:       4.0.2
-Release:       12
+Release:       22
 License:       GPL
 Group:         Base
 Group(de):     Gründsätzlich
@@ -33,11 +33,18 @@ Patch9:             %{name}-installplatform.patch
 Patch10:       %{name}-cache.patch
 Patch11:       %{name}-suggestions.patch
 Patch12:       %{name}-rh-lame.patch
+Patch13:       %{name}-glob.patch
+Patch14:       %{name}-header_h.patch  
+Patch15:       %{name}-fast-alAddPackage.patch
+Patch16:       %{name}-byKey.patch
+Patch17:       %{name}-perlprov.patch
+Patch18:       %{name}-noperldir.patch
+Patch19:       popt-cvs20010530.patch
 Patch37:        %{name}-short_circuit.patch
 Patch38:        %{name}-section_test.patch
 BuildRequires: gettext-devel
 BuildRequires: automake
-BuildRequires: db3-devel >= 3.1.17
+BuildRequires: db3-devel >= 3.1.17-9
 BuildRequires: bzip2-devel >= 1.0.1
 BuildRequires: gdbm-devel
 BuildRequires: zlib-devel
@@ -45,10 +52,10 @@ BuildRequires:      gettext-devel >= 0.10.38-3
 BuildRequires: libtool
 BuildRequires: automake
 BuildRequires: autoconf >= 2.13-8
-%if %{!?bcond_off_static:1}%{?bcond_off_static:0}
+BuildRequires: python-modules >= 2.2.1
 BuildRequires: zlib-devel >= 1.1.4
 # Require static library only for static build
-BuildRequires: db3-static >= 3.1.17
+BuildRequires: db3-static >= 3.1.17-9
 BuildRequires: bzip2-static >= 1.0.1
 BuildRequires: gdbm-static
 BuildRequires: zlib-static
@@ -78,7 +85,7 @@ RPM jest doskona
 %description -l pl
 RPM jest doskona³ym mened¿erem pakietów. Dziêki niemu bêdziesz móg³
 wchodz±cych w sk³ad pakietu, zale¿no¶ci od innych pakietów s±
-przechowywane s± w bazie danych i mo¿na je uzyskaæ za pomoc± opcji
+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
 do pacote, permissões dos arquivos, etc.
@@ -185,6 +192,8 @@ Requires:   diffutils
 Requires:      libtool
 Requires:      glibc-devel
 Requires:      sed
+Requires:      sed
+Requires:      popt >= 1.6.2-2
 Requires:      tar
 Requires:      textutils
 
@@ -210,6 +219,13 @@ construir pacotes usando o RPM.
 %patch8 -p1
 %patch11 -p0
 %patch12 -p0
+%patch11 -p0
+%patch12 -p0
+%patch15 -p0
+%patch16 -p0
+%patch15 -p0
+%patch16 -p0
+%patch17 -p1
 %patch31 -p1
 install %{SOURCE2} macros.pld.in
 %patch38 -p1
@@ -225,17 +241,20 @@ install %{SOURCE9} scripts/find-lang.sh
 mv -f perl.req perl.req.in
 mv -f perl.prov perl.prov.in)
 
-(cd popt;
- libtoolize --force --copy
- aclocal
- autoheader
- autoconf
- automake -a -c)
+cd popt
+autoupdate
+awk -f %{SOURCE14} %{SOURCE1}
+
+cd popt
+autoconf
+automake -a -c
+cd ..
 autoheader
+autoupdate
 %{__automake}
 cd ..
 
-autoheader
+libtoolize --force --copy
 autoconf
 # ugly workaround for automake
 sed -e 's#cpio.c $(DBLIBOBJS) depends.c#cpio.c depends.c#g' \
@@ -249,9 +268,7 @@ mv -f lib/Makefile.in.new lib/Makefile.in
        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 <rpmio\/rpmio\.h>/g' lib/header.h > lib/header.h.new
-mv -f lib/header.h.new lib/header.h
+       --enable-v1-packages \
        --with-python