--- /dev/null
+diff -Nur rpm-4.1/po.orig/pl.po rpm-4.1/po/pl.po
+--- rpm-4.1/po.orig/pl.po Sun Nov 24 18:56:42 2002
++++ rpm-4.1/po/pl.po Sun Nov 24 18:58:25 2002
+@@ -3055,7 +3055,7 @@
+ #.
+ #: lib/transaction.c:1021
+ #, c-format
+-msgid "sanity checking %d elments\n"
++msgid "sanity checking %d elements\n"
+ msgstr "sprawdzanie poprawno¶ci %d elementów\n"
+
+ #. ===============================================
+diff -Nur rpm-4.1/po.orig/ru.po rpm-4.1/po/ru.po
+--- rpm-4.1/po.orig/ru.po Tue Sep 17 21:38:06 2002
++++ rpm-4.1/po/ru.po Sun Nov 24 18:58:34 2002
+@@ -3065,7 +3065,7 @@
+ #.
+ #: lib/transaction.c:1021
+ #, c-format
+-msgid "sanity checking %d elments\n"
++msgid "sanity checking %d elements\n"
+ msgstr "ÐÒÏ×eÒÑÅÔÓÑ %d ÜÌÅÍÅÎÔÏ×\n"
+
+ #. ===============================================
+diff -Nur rpm-4.1/po.orig/sv.po rpm-4.1/po/sv.po
+--- rpm-4.1/po.orig/sv.po Tue Sep 17 21:38:08 2002
++++ rpm-4.1/po/sv.po Sun Nov 24 18:58:42 2002
+@@ -3048,7 +3048,7 @@
+ #.
+ #: lib/transaction.c:1021
+ #, c-format
+-msgid "sanity checking %d elments\n"
++msgid "sanity checking %d elements\n"
+ msgstr "rimlighetskontrollerar %d element\n"
+
+ #. ===============================================
--- /dev/null
+--- rpm-4.1/beecrypt/configure.ac.orig Sat Jun 15 20:49:02 2002
++++ rpm-4.1/beecrypt/configure.ac Sun Nov 24 19:51:39 2002
+@@ -82,11 +82,6 @@
+ AC_PROG_CXX
+ AC_PROG_LIBTOOL
+
+-# Initialize tool flags
+-CFLAGS=""
+-CPPFLAGS=""
+-LDFLAGS=""
+-
+ # Checks for compiler characteristics and flags
+ if test "$ac_cv_prog_gcc" != yes; then
+ AC_CACHE_CHECK([whether we are using Sun Workshop C], ac_cv_prog_SUNPRO_CC, [
+@@ -706,7 +697,6 @@
+ fi
+ else
+ if test "$ac_cv_prog_gcc" = yes; then
+- CFLAGS="$CFLAGS -O3 -g"
+ if test "$ac_enable_optimized" = yes; then
+ case $target_cpu in
+ # This switch makes the mp32 routines slower by about 10%, so it's disabled
+@@ -717,16 +707,16 @@
+ CFLAGS="$CFLAGS -fomit-frame-pointer"
+ ;;
+ i386)
+- CFLAGS="$CFLAGS -march=i386 -mcpu=i686 -fomit-frame-pointer"
++ CFLAGS="$CFLAGS -fomit-frame-pointer"
+ ;;
+ i486)
+- CFLAGS="$CFLAGS -march=i386 -mcpu=i686 -fomit-frame-pointer"
++ CFLAGS="$CFLAGS -fomit-frame-pointer"
+ ;;
+ i586)
+- CFLAGS="$CFLAGS -march=i386 -mcpu=i686 -fomit-frame-pointer"
++ CFLAGS="$CFLAGS -fomit-frame-pointer"
+ ;;
+ i686)
+- CFLAGS="$CFLAGS -march=i386 -mcpu=i686 -fomit-frame-pointer"
++ CFLAGS="$CFLAGS -fomit-frame-pointer"
+ ;;
+ sparc)
+ CFLAGS="$CFLAGS -m32 -mtune=ultrasparc"
+@@ -787,8 +777,6 @@
+ if test "$ac_enable_threads" = yes; then
+ CFLAGS="$CFLAGS -pthread"
+ fi
+- else
+- CFLAGS="$CFLAGS -O2"
+ fi
+ fi
+
--- /dev/null
+--- rpm-4.1/build/Makefile.am.orig Mon Jul 22 00:06:19 2002
++++ rpm-4.1/build/Makefile.am Sun Nov 24 19:25:53 2002
+@@ -23,12 +23,7 @@
+ parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
+ parseSpec.c poptBT.c reqprov.c spec.c
+ librpmbuild_la_LDFLAGS = -release @VERSION@
+-
+-# XXX Add internal libtool dependence
+-install-data-local:
+- @cd $(DESTDIR)/$(libdir) && \
+- sed -e "s|^dependency_libs='|& -lrpm-@VERSION@|" < librpmbuild.la > .librpmbuild.la && \
+- mv .librpmbuild.la librpmbuild.la
++librpmbuild_la_LIBADD = ../lib/librpm.la
+
+ #BUILT_SOURCES = rpmbuild.lcd
+
+--- rpm-4.1/lib/Makefile.am.orig Fri Aug 30 13:41:54 2002
++++ rpm-4.1/lib/Makefile.am Sun Nov 24 19:29:23 2002
+@@ -38,12 +38,7 @@
+ signature.c stringbuf.c transaction.c \
+ verify.c
+ librpm_la_LDFLAGS = -release @VERSION@
+-
+-# XXX Add internal libtool dependence
+-install-data-local:
+- @cd $(DESTDIR)/$(libdir) && \
+- sed -e "s|^dependency_libs='|& -lrpmdb-@VERSION@ -lrpmio-@VERSION@ -lpopt|" < librpm.la > .librpm.la && \
+- mv .librpm.la librpm.la
++librpm_la_LIBADD = ../rpmdb/librpmdb.la ../rpmio/librpmio.la -lpopt
+
+ getdate.c: getdate.y
+ @echo expect 10 shift/reduce conflicts
+--- rpm-4.1/rpmdb/Makefile.am.orig Fri Aug 30 15:12:01 2002
++++ rpm-4.1/rpmdb/Makefile.am Sun Nov 24 19:30:41 2002
+@@ -40,18 +40,12 @@
+ poptDB.c rpmhash.c rpmdb.c \
+ tagname.c tagtbl.c
+ librpmdb_la_LDFLAGS = -release @VERSION@ @libdb3@
+-librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS) @WITH_LIBELF_LIB@
++librpmdb_la_LIBADD = ../rpmio/librpmio.la $(DBLIBOBJS) $(DB3LOBJS) @WITH_LIBELF_LIB@
+ librpmdb_la_DEPENDENCIES = $(DBLIBOBJS) .created
+
+ # XXX make sure that db.h symlink is generated
+ dbconfig.c: db.h
+
+-# XXX Add internal libtool dependence
+-install-data-local:
+- @cd $(DESTDIR)/$(libdir) && \
+- sed -e "s|^dependency_libs='|& -lrpmio-@VERSION@|" < librpmdb.la > .librpmdb.la && \
+- mv .librpmdb.la librpmdb.la
+-
+ tagtbl.c: Makefile.am $(top_srcdir)/lib/rpmlib.h
+ @echo '/*@-bounds@*/' > $@
+ @echo '#include "system.h"' >> $@
+--- rpm-4.1/rpmio/Makefile.am.orig Sun Nov 24 19:22:06 2002
++++ rpm-4.1/rpmio/Makefile.am Sun Nov 24 19:31:18 2002
+@@ -26,15 +26,9 @@
+ rpmio.c rpmlog.c rpmmalloc.c \
+ rpmpgp.c rpmrpc.c strcasecmp.c stubs.c url.c ugid.c
+ librpmio_la_LDFLAGS = -release @VERSION@ @WITH_ZLIB_LIB@ -lrt -lpthread
+-librpmio_la_LIBADD = $(BEECRYPTLOBJS)
++librpmio_la_LIBADD = -lpopt $(BEECRYPTLOBJS)
+ librpmio_la_DEPENDENCIES = .created
+
+-# XXX Add internal libtool dependence
+-install-data-local:
+- @cd $(DESTDIR)/$(libdir) && \
+- sed -e "s|^dependency_libs='|& -lpopt|" < librpmio.la > .librpmio.la && \
+- mv .librpmio.la librpmio.la
+-
+ $(top_builddir)/beecrypt/listobjs:
+ ${MAKE} -C $(top_builddir)/beecrypt listobjs
+
%__libtoolize libtoolize --copy --force
%__gettextize { \
if ! gettextize --version | grep -q '0\.10\.' ; then \
- if [ -f po/Makevars ]; then \
- gettextize --copy --force --no-changelog; \
- else \
- gettextize --copy --force --no-changelog --intl; \
- cp -f po/Makevars{.template,}; \
- fi; \
+ if grep -qs 'AM_GNU_GETTEXT.*external' configure.{ac,in} ; then \
+ gettextize --copy --force --no-changelog; \
else \
- gettextize --copy --force; \
+ gettextize --copy --force --no-changelog --intl; \
+ fi; \
+ if [ ! -f po/Makevars ]; then \
+ cp -f po/Makevars{.template,}; \
+ fi; \
+ else \
+ gettextize --copy --force; \
fi; \
-}
+}
+%__autopoint autopoint --force
%__automake automake -a -c -f --foreign
%__autoconf autoconf %{?debug:-Wall}
%include /usr/lib/rpm/macros.python
%define beecrypt_ver 2.2.0
-%define beecrypt_rel 1.5
+%define beecrypt_rel 2
Summary: RPM Package Manager
Summary(de): RPM Packet-Manager
Summary(es): Gestor de paquetes RPM
Summary(pt_BR): Gerenciador de pacotes RPM
Name: rpm
Version: 4.1
-Release: 4
+Release: 5
License: GPL
Group: Base
Source0: ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/%{name}-%{version}.tar.gz
Patch23: %{name}-python-link.patch
Patch24: %{name}-system_libs.patch
Patch25: %{name}-bb-and-short-circuit.patch
+Patch26: %{name}-4.1-branch-po-updates.patch
+Patch27: %{name}-link.patch
+Patch28: %{name}-beecrypt-opt.patch
URL: http://www.rpm.org/
Icon: rpm.gif
BuildRequires: autoconf >= 2.52
%define __find_provides %{SOURCE4}
%define _binary_payload w9.gzdio
+# don't require very fresh rpm.macros to build
+%define __gettextize gettextize --copy --force --intl ; cp -f po/Makevars{.template,}
+
%description
RPM is a powerful package manager, which can be used to build,
install, query, verify, update, and uninstall individual software
%patch23 -p1
%patch24 -p1
%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
cp -f platform.in macros.pld.in
%{__libtoolize}
%{__gettextize}
%{__aclocal}
-autoupdate
-%{__autoheader} || :
+%{__autoheader}
%{__autoconf}
%{__automake}