- obsolete

Changed files:
    rpm-ac25x.patch -> 1.4
    rpm-acconfig.patch -> 1.2
    rpm-am_fix.patch -> 1.4
    rpm-check_files.patch -> 1.7
    rpm-choke-on-evil-doc.patch -> 1.4
    rpm-installplatform.patch -> 1.7
    rpm-non-english-man-pages.patch -> 1.3
    rpm-python-amfix.patch -> 1.3

diff --git a/rpm-ac25x.patch b/rpm-ac25x.patch
deleted file mode 100644 (file)
index bb4dbc7..0000000
--- a/rpm-ac25x.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- rpm-4.0.4/configure.in.orig        Sat Mar 16 20:30:55 2002
-+++ rpm-4.0.4/configure.in     Sat Mar 16 20:32:13 2002
-@@ -17,8 +17,6 @@
- dnl Set of available languages.
- ALL_LINGUAS="cs da de en_RN es eu_ES fi fr gl hu id is it ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"
- 
--LIBOBJS=
--
- dnl Checks for programs.
- AC_PROG_CC
- AC_AIX
-@@ -452,7 +450,7 @@
- done
- 
- AC_CHECK_FUNC(fork, [], [echo "using vfork() instead of fork()";
--      LIBOBJS=fakefork.o])
-+      AC_LIBOBJ([fakefork])])
- 
- dnl AmigaOS and IXEmul have a fork() dummy
-     case "$target" in
-@@ -489,7 +487,7 @@
- AC_CHECK_FUNCS(personality)
- 
- dnl XXX these are needed only by rpmgettext right now
--AM_FUNC_ERROR_AT_LINE
-+AC_FUNC_ERROR_AT_LINE
- 
- dnl ==> AM_GNU_GETTEXT does this (and more)
- dnl AC_CHECK_HEADERS(unistd.h limits.h locale.h malloc.h string.h sys/param.h)
-@@ -726,7 +724,7 @@
- 
- AC_FUNC_FNMATCH
- if test $ac_cv_func_fnmatch_works = no; then
--   LIBOBJS="$LIBOBJS fnmatch.o"
-+   AC_LIBOBJ([fnmatch])
- dnl XXX no expansion needed
- dnl AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
- fi
-@@ -771,7 +769,7 @@
- dnl 
- dnl if test $rpm_cv_regex = yes; then
- dnl     AC_DEFINE(USE_GNU_REGEX)
--dnl     LIBOBJS="$LIBOBJS regex.o"
-+dnl     AC_LIBOBJ([regex])
- dnl fi
- 
- dnl
-@@ -810,7 +808,8 @@
- 
- if test "$rpm_cv_glob" = yes; then
-     AC_DEFINE(USE_GNU_GLOB)
--    LIBOBJS="$LIBOBJS glob.o fnmatch.o"
-+    AC_LIBOBJ([glob])
-+    AC_LIBOBJ([fnmatch])
- fi
- dnl
- dnl Auto-detect which python bindings should be built.
-@@ -899,7 +897,7 @@
-       AC_CHECK_LIB(c_r, getmntinfo_r, [LIBS="$LIBS -lc_r"; 
-                                       AC_DEFINE(HAVE_GETMNTINFO_R)], [
-                AC_DEFINE([USE_GETMNTENT], 1, [Defined if getmntent replacement is used])
--                 LIBOBJS="$LIBOBJS getmntent.o"])])])])
-+                 AC_LIBOBJ([getmntent])])])])])
- 
- AC_CHECK_FUNC(lchown,
-    [__CHOWN_RHF="%{__chown} -Rhf"
-@@ -1014,7 +1012,7 @@
-       CFLAGS="$CFLAGS -D__USE_FIXED_PROTOTYPES__"
-       AC_DEFINE(NEED_STRINGS_H)
-       AC_DEFINE(NEED_MYREALLOC)
--      LIBOBJS="$LIBOBJS myrealloc.o"
-+      AC_LIBOBJ([myrealloc])
- fi
- 
- #
-@@ -1103,10 +1101,9 @@
- AC_SUBST(RPMCANONVENDOR)
- AC_SUBST(RPMCANONOS)
- 
--if test -n "$LIBOBJS" ; then
-+if test -n "$LIB@&t@OBJS" ; then
-     LIBMISC='$(top_builddir)/misc/libmisc.a'
- fi
--AC_SUBST(LIBOBJS)
- AC_SUBST(LIBMISC)
- 
- if test X"$prefix" = XNONE ; then
-@@ -1149,7 +1146,7 @@
- dnl AC_DEFINE_UNQUOTED(testdir, "$testdir")
- AC_SUBST(testdir)
- 
--if test -n "$LIBOBJS"; then
-+if test -n "$LIB@&t@OBJS"; then
-     INCPATH="-I\$(top_builddir)/misc $INCPATH"
- fi
- AC_SUBST(INCPATH)

diff --git a/rpm-acconfig.patch b/rpm-acconfig.patch
deleted file mode 100644 (file)
index f0069d6..0000000
--- a/rpm-acconfig.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- rpm-4.0.4/popt/acconfig.h.popt     Wed Feb 13 00:56:33 2002
-+++ rpm-4.0.4/popt/acconfig.h  Wed Feb 13 00:56:44 2002
-@@ -16,7 +16,6 @@
-    a given entry is in the file.
- 
-    Leave the following blank line there!!  Autoheader needs it.  */
--^L
- 
- /* Define to the name of the distribution.  */
- #undef PACKAGE
-@@ -45,7 +44,6 @@
- /* Absolute path to popt top_sourcedir. */
- #undef POPT_SOURCE_PATH
- 
--^L
- /* Leave that blank line there!!  Autoheader needs it.
-    If you're adding to this file, keep in mind:
-    The entries are in sort -df order: alphabetical, case insensitive,
---- rpm-4.0.4/acconfig.h.wiget Wed Feb 13 01:05:25 2002
-+++ rpm-4.0.4/acconfig.h       Wed Feb 13 01:06:48 2002
-@@ -12,7 +12,6 @@
-    a given entry is in the file.
- 
-    Leave the following blank line there!!  Autoheader needs it.  */
--^L
- 
- /* Define to the name of the distribution.  */
- #undef PACKAGE
-@@ -156,7 +155,6 @@
- /* Define if you have the getmntent() function */
- #undef HAVE_GETMNTENT
- 
--^L
- /* Leave that blank line there!!  Autoheader needs it.
-    If you're adding to this file, keep in mind:
-    The entries are in sort -df order: alphabetical, case insensitive,

diff --git a/rpm-am_fix.patch b/rpm-am_fix.patch
deleted file mode 100644 (file)
index 982adbf..0000000
--- a/rpm-am_fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- rpm-4.0.4/rpmio/Makefile.am.wiget2 Wed Jan 23 02:03:42 2002
-+++ rpm-4.0.4/rpmio/Makefile.am        Wed Feb 13 00:05:09 2002
-@@ -21,7 +21,7 @@
-       ugid.h
- noinst_HEADERS = rpmio_internal.h rpmpgp.h
- 
--LIBS +=       @WITH_ZLIB_LIB@ -lrt -lpthread
-+LIBS =        @LIBS@ @WITH_ZLIB_LIB@ -lrt -lpthread
- 
- BEECRYPTLOBJS = $(shell cat $(top_builddir)/beecrypt/listobjs)
- 
-@@ -51,18 +51,18 @@
-       rm -f $(BEECRYPTLOBJS) *.o .created
- 
- tdigest_SOURCES = tdigest.c
--tdigest_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
-+tdigest_LDADD = $(LDADD) librpmio.la $(top_builddir)/popt/libpopt.la
- 
- trpmio_SOURCES = trpmio.c
--trpmio_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
-+trpmio_LDADD = $(LDADD) librpmio.la $(top_builddir)/popt/libpopt.la
- 
- tkey_SOURCES = tkey.c
- tkey_LDFLAGS = -all-static
--tkey_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
-+tkey_LDADD = $(LDADD) librpmio.la $(top_builddir)/popt/libpopt.la
- 
- tring_SOURCES = tring.c
- tring_LDFLAGS = -all-static
--tring_LDADD += librpmio.la $(top_builddir)/popt/libpopt.la
-+tring_LDADD = $(LDADD) librpmio.la $(top_builddir)/popt/libpopt.la
- 
- dumpasn1_SOURCES = dumpasn1.c
- 
---- rpm-4.0.4/rpmdb/Makefile.am.wiget2 Wed Feb 13 00:11:45 2002
-+++ rpm-4.0.4/rpmdb/Makefile.am        Wed Feb 13 00:11:23 2002
-@@ -28,7 +28,7 @@
- DB3LOBJS = $(shell cat $(top_builddir)/$(WITH_DB_SUBDIR)/db3lobjs)
- 
- lib_LTLIBRARIES = librpmdb.la
--librpmdb_la_SOURCES = $(DBLIBSRCS) \
-+librpmdb_la_SOURCES = \
-       dbconfig.c fprint.c poptDB.c rpmhash.c rpmdb.c
- librpmdb_la_LDFLAGS = -release @VERSION@ @libdb3@
- librpmdb_la_LIBADD = $(DBLIBOBJS) $(DB3LOBJS)

diff --git a/rpm-check_files.patch b/rpm-check_files.patch
deleted file mode 100644 (file)
index 6e1a74b..0000000
--- a/rpm-check_files.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -urN rpm-4.0.4.org/build/files.c rpm-4.0.4/build/files.c
---- rpm-4.0.4.org/build/files.c        Sun Jul 28 00:22:46 2002
-+++ rpm-4.0.4/build/files.c    Sun Jul 28 00:23:54 2002
-@@ -90,6 +90,10 @@
- /*@unchecked@*/
- static int multiLib = 0;      /* MULTILIB */
- 
-+/* list of files */
-+static StringBuf check_fileList = NULL;
-+static int check_fileListLen = 0;
-+
- /**
-  * Package file tree walk data.
-  */
-@@ -1593,6 +1597,13 @@
-       (unsigned)fileMode, fileUname, fileGname, fileURL);
- #endif
- 
-+    /* S_XXX macro must be consistent with type in find call at check-files script */
-+    if (S_ISREG(fileMode)) {
-+      appendStringBuf(check_fileList, diskURL);
-+      appendStringBuf(check_fileList, "\n");
-+      check_fileListLen += strlen(diskURL) + 1;
-+    }
-+
-     /* Add to the file list */
-     if (fl->fileListRecsUsed == fl->fileListRecsAlloced) {
-       fl->fileListRecsAlloced += 128;
-@@ -2655,11 +2671,54 @@
-     versions = hfd(versions, dvt);
- }
- 
-+static int checkFiles(StringBuf fileList, int fileListLen)
-+{
-+    StringBuf readBuf = NULL;
-+    char* myargv[3] = {NULL, NULL, NULL};
-+    int rc = 0;
-+    char *buf;
-+    
-+    myargv[0] = rpmExpand("%{__check_files}", NULL);
-+    if (!(myargv[0] && *myargv[0] != '%')) {
-+        rc = -1;
-+        goto exit;
-+    }    
-+    myargv[1] = rpmExpand("%{buildroot}", NULL);
-+    if (!(myargv[1] && *myargv[1] != '%')) {
-+        rc = -1;
-+        goto exit;
-+    }
-+    
-+    rpmMessage(RPMMESS_NORMAL, _("Searching for omited files: (using %s)...\n"),
-+               myargv[0]);
-+                  
-+    readBuf = getOutputFrom(NULL, myargv, getStringBuf(fileList), fileListLen, 0);
-+    
-+    if (readBuf) {
-+        buf = getStringBuf(readBuf);
-+        if ((*buf != '\0') && (*buf != '\n'))
-+            rpmMessage(RPMMESS_WARNING, \
-+                      _("found installed files not placed in any package:\n---\n%s---\n"),
-+                       buf);
-+    }
-+    
-+exit:
-+    
-+    freeStringBuf(readBuf);
-+    _free(myargv[0]);
-+    _free(myargv[1]);
-+
-+    return rc;
-+}
-+
- int processBinaryFiles(Spec spec, int installSpecialDoc, int test)
- {
-     Package pkg;
-     int res = 0;
-     
-+    check_fileList = newStringBuf();
-+    check_fileListLen = 0;
-+    
-     for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
-       const char *n, *v, *r;
-       int rc;
-@@ -2687,5 +2746,15 @@
-       /*@=noeffect@*/
-     }
- 
-+    /* Now we have in fileList list of files from all packages.
-+     * We pass it to a script which do the work of finding missing
-+     * and duplicated files.
-+     */
-+    
-+    if (res == 0) 
-+        checkFiles(check_fileList, check_fileListLen);
-+    
-+    freeStringBuf(check_fileList);
-+    
-     return res;
- }
-diff -Nur rpm-4.0.4.orig/platform.in rpm-4.0.4/platform.in
---- rpm-4.0.4.orig/platform.in Sun Jun 30 00:07:54 2002
-+++ rpm-4.0.4/platform.in      Sun Jun 30 00:13:45 2002
-@@ -89,6 +89,10 @@
- #     Expanded at end of %install scriptlet.
- #
- 
-+# Gets file list on input and buildroot as first parameter
-+# and returns list of files not found in any package
-+%__check_files                @prefix@/lib/rpm/check-files
-+
- %__arch_install_post   @ARCH_INSTALL_POST@
- 
- %__os_install_post    \

diff --git a/rpm-choke-on-evil-doc.patch b/rpm-choke-on-evil-doc.patch
deleted file mode 100644 (file)
index 2b881d9..0000000
--- a/rpm-choke-on-evil-doc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur rpm-4.0.4/build/files.c rpm-4.0.4-/build/files.c
---- rpm-4.0.4/build/files.c    Tue Jul 23 10:38:11 2002
-+++ rpm-4.0.4-/build/files.c   Tue Jul 23 10:37:57 2002
-@@ -1943,7 +1943,10 @@
-     /* Now process special doc, if there is one */
-     if (specialDoc) {
-       if (installSpecialDoc) {
--          (void) doScript(spec, RPMBUILD_STRINGBUF, "%doc", pkg->specialDoc, test);
-+          int rc = doScript(spec, RPMBUILD_STRINGBUF, "%doc", 
-+                            pkg->specialDoc, test);
-+          if (rc)
-+              fl.processingFailed = rc;
-       }
- 
-       /* Reset for %doc */
-Only in rpm-4.0.4-/build: tags

diff --git a/rpm-installplatform.patch b/rpm-installplatform.patch
deleted file mode 100644 (file)
index 7385a5f..0000000
--- a/rpm-installplatform.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- rpm-4.0.4/installplatform.wiget    Tue Feb 12 21:59:53 2002
-+++ rpm-4.0.4/installplatform  Tue Feb 12 22:31:13 2002
-@@ -21,12 +21,13 @@
- 
- RPM="./rpm --rcfile $TEMPRC"
- 
--arch="`$RPM --eval '%{_arch}'`"
-+canonarch_sed='s_i.86_i386_;s_athlon_i386_;s_sparc[^-]*_sparc_;s_alpha[^-]*_alpha_;s_\(powerpc\|ppc\)[^-]*_ppc_'
-+arch="`$RPM --eval '%{_arch}'|sed -e "$canonarch_sed"`"
- VENDOR="`$RPM --eval '%{_vendor}'`"
- OS="`$RPM --eval '%{_os}'`"
- RPMRC_GNU="`$RPM --eval '%{_gnu}'`"
--target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'`"
--target="`$RPM --eval '%{_target}'`"
-+target_platform="`$RPM --eval '%{?_gnu:%undefine _gnu}%{_target_platform}'|sed -e "$canonarch_sed"`"
-+target="`$RPM --eval '%{_target}'|sed -e "$canonarch_sed"`"
- 
- rm -f ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS}
- ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS}
-@@ -34,13 +35,12 @@
- ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${OS}
- 
- case "$arch" in
--  i[3456]86) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;;
-+  i[3456]86|athlon) SUBSTS='s_i386_i386_ s_i386_i486_ s_i386_i586_ s_i386_i686_ s_i386_athlon_' ;;
-   alpha*) SUBSTS='s_alpha_alpha_ s_alpha_alphaev5_ s_alpha_alphaev56_ s_alpha_alphapca56_ s_alpha_alphaev6_ s_alpha_alphaev67_' ;;
-   sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;;
-   powerpc*|ppc*) SUBSTS='s_ppc64_ppc_ s_ppc\([^6]\|$\)_ppc64\1_' ;;
-   *) SUBSTS=y___ ;;
- esac
--base_arch=`echo $arch | sed -e 's_i?86_i386_;s_sparc.*_sparc_;s_alpha.*_alpha_;s_\(powerpc\|ppc\).*_ppc_'`
- 
- for SUBST in $SUBSTS ; do
-   ARCH=`echo $arch | sed -e $SUBST`
-@@ -76,6 +76,7 @@
-   case $VENDOR in
-   pld)
-     VENDORSED='-e s,^@pld@,,'
-+    RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e "s/ -g/ /"`"
-     ;;
-   mandrake)
-     VENDORSED='-e s,^@mandrake@,,'
-@@ -91,12 +92,12 @@
- 
-   cat $PLATFORM \
-   | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \
--      -e "s,@RPMRC_ARCH@,$base_arch," \
-+      -e "s,@RPMRC_ARCH@,$ARCH," \
-       -e "s,@RPMRC_GNU@,$RPMRC_GNU," \
-       -e "s,@LIB@,$LIB," \
-       -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \
-       -e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \
--      -e '/FLAGS:-/!s,\${,%{_,' \
-+      -e '/\${\w*:-/!s,\${,%{_,' \
-       $MULTILIBSED \
-       $VENDORSED \
-   | grep -v '^@' \
-

diff --git a/rpm-non-english-man-pages.patch b/rpm-non-english-man-pages.patch
deleted file mode 100644 (file)
index 52edb9d..0000000
--- a/rpm-non-english-man-pages.patch
+++ /dev/null
@@ -1,737 +0,0 @@
-Context lines from the first chunk intentionally removed
-to avoid conflicts with other patches.
-************************************************************
-diff -uNr -C0 rpm-4.0.2.orig/configure.in rpm-4.0.2/configure.in
---- rpm-4.0.2.orig/configure.in        Mon Sep 17 21:04:12 2001
-+++ rpm-4.0.2/configure.in     Mon Sep 17 21:05:36 2001
-@@ -1094,1 +1094,2 @@
--      doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
-+      doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile
-+      doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
-diff -uNr rpm-4.0.2.orig/doc/Makefile.am rpm-4.0.2/doc/Makefile.am
---- rpm-4.0.2.orig/doc/Makefile.am     Mon Oct 16 19:37:46 2000
-+++ rpm-4.0.2/doc/Makefile.am  Mon Sep 17 20:52:13 2001
-@@ -1,6 +1,6 @@
- ## Process this file with automake to produce Makefile.in
- 
--SUBDIRS               = manual ja pl ru sk
-+SUBDIRS               = manual fr ja ko pl ru sk
- 
- man_MANS      = gendiff.1 rpm.8 rpm2cpio.8
- 
-diff -uNr rpm-4.0.2.orig/doc/Makefile.in rpm-4.0.2/doc/Makefile.in
---- rpm-4.0.2.orig/doc/Makefile.in     Tue Mar 13 14:19:01 2001
-+++ rpm-4.0.2/doc/Makefile.in  Mon Sep 17 20:52:13 2001
-@@ -170,7 +170,7 @@
- tmpdir = @tmpdir@
- varprefix = @varprefix@
- 
--SUBDIRS = manual ja pl ru sk
-+SUBDIRS = manual fr ja ko pl ru sk
- 
- man_MANS = gendiff.1 rpm.8 rpm2cpio.8
- 
-diff -uNr rpm-4.0.2.orig/doc/fr/Makefile.am rpm-4.0.2/doc/fr/Makefile.am
---- rpm-4.0.2.orig/doc/fr/Makefile.am  Thu Jan  1 01:00:00 1970
-+++ rpm-4.0.2/doc/fr/Makefile.am       Mon Sep 17 20:52:13 2001
-@@ -0,0 +1,8 @@
-+## Process this file with automake to produce Makefile.in
-+
-+@SET_MAKE@
-+
-+man_MANS      = rpm.8
-+mandir                = @mandir@/fr
-+
-+EXTRA_DIST    = $(man_MANS)
-diff -uNr rpm-4.0.2.orig/doc/fr/Makefile.in rpm-4.0.2/doc/fr/Makefile.in
---- rpm-4.0.2.orig/doc/fr/Makefile.in  Thu Jan  1 01:00:00 1970
-+++ rpm-4.0.2/doc/fr/Makefile.in       Mon Sep 17 20:52:13 2001
-@@ -0,0 +1,324 @@
-+# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_alias = @build_alias@
-+build_triplet = @build@
-+host_alias = @host_alias@
-+host_triplet = @host@
-+target_alias = @target_alias@
-+target_triplet = @target@
-+AR = @AR@
-+AS = @AS@
-+AWK = @AWK@
-+BUILD_RPMNLSTOOLS = @BUILD_RPMNLSTOOLS@
-+BZIP2BIN = @BZIP2BIN@
-+CATALOGS = @CATALOGS@
-+CATOBJEXT = @CATOBJEXT@
-+CC = @CC@
-+CPP = @CPP@
-+CSCOPE = @CSCOPE@
-+CTAGS = @CTAGS@
-+DATADIRNAME = @DATADIRNAME@
-+DBLIBOBJS = @DBLIBOBJS@
-+DBLIBSRCS = @DBLIBSRCS@
-+DLLTOOL = @DLLTOOL@
-+FINDPROVIDES = @FINDPROVIDES@
-+FINDREQUIRES = @FINDREQUIRES@
-+FIXPERMS = @FIXPERMS@
-+GENCAT = @GENCAT@
-+GMOFILES = @GMOFILES@
-+GMSGFMT = @GMSGFMT@
-+GT_NO = @GT_NO@
-+GT_YES = @GT_YES@
-+GZIPBIN = @GZIPBIN@
-+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
-+INCPATH = @INCPATH@
-+INSTOBJEXT = @INSTOBJEXT@
-+INTLDEPS = @INTLDEPS@
-+INTLLIBS = @INTLLIBS@
-+INTLOBJS = @INTLOBJS@
-+LDFLAGS_STATIC = @LDFLAGS_STATIC@
-+LIBDIR = @LIBDIR@
-+LIBMISC = @LIBMISC@
-+LIBOBJS = @LIBOBJS@
-+LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@
-+LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LN_S = @LN_S@
-+LOCALEDIR = @LOCALEDIR@
-+MACROFILES = @MACROFILES@
-+MAKEINFO = @MAKEINFO@
-+MKDIR = @MKDIR@
-+MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MSGFMT = @MSGFMT@
-+OBJDUMP = @OBJDUMP@
-+PACKAGE = @PACKAGE@
-+PGPBIN = @PGPBIN@
-+POFILES = @POFILES@
-+POSUB = @POSUB@
-+RANLIB = @RANLIB@
-+ROOT_GROUP = @ROOT_GROUP@
-+RPM = @RPM@
-+RPMCANONARCH = @RPMCANONARCH@
-+RPMCANONOS = @RPMCANONOS@
-+RPMCANONVENDOR = @RPMCANONVENDOR@
-+RPMCONFIGDIR = @RPMCONFIGDIR@
-+SYSCONFIGDIR = @SYSCONFIGDIR@
-+TOP_SOURCEDIR = @TOP_SOURCEDIR@
-+U = @U@
-+UNZIPBIN = @UNZIPBIN@
-+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-+USE_NLS = @USE_NLS@
-+VERSION = @VERSION@
-+WITH_APIDOCS = @WITH_APIDOCS@
-+WITH_APIDOCS_TARGET = @WITH_APIDOCS_TARGET@
-+WITH_BZIP2 = @WITH_BZIP2@
-+WITH_PYTHON_SUBDIR = @WITH_PYTHON_SUBDIR@
-+WITH_PYTHON_SUBPACKAGE = @WITH_PYTHON_SUBPACKAGE@
-+__CAT = @__CAT@
-+__CHGRP = @__CHGRP@
-+__CHGRP_RHF = @__CHGRP_RHF@
-+__CHMOD = @__CHMOD@
-+__CHOWN = @__CHOWN@
-+__CHOWN_RHF = @__CHOWN_RHF@
-+__CP = @__CP@
-+__CPIO = @__CPIO@
-+__DOXYGEN = @__DOXYGEN@
-+__GREP = @__GREP@
-+__ID = @__ID@
-+__ID_U = @__ID_U@
-+__INSTALL = @__INSTALL@
-+__LD = @__LD@
-+__MAKE = @__MAKE@
-+__MKDIR = @__MKDIR@
-+__MV = @__MV@
-+__NM = @__NM@
-+__OBJCOPY = @__OBJCOPY@
-+__OBJDUMP = @__OBJDUMP@
-+__PATCH = @__PATCH@
-+__PERL = @__PERL@
-+__PYTHON = @__PYTHON@
-+__RM = @__RM@
-+__RSH = @__RSH@
-+__SED = @__SED@
-+__SSH = @__SSH@
-+__STRIP = @__STRIP@
-+__TAR = @__TAR@
-+l = @l@
-+libdb1 = @libdb1@
-+libdb2 = @libdb2@
-+libdb3 = @libdb3@
-+testdir = @testdir@
-+tmpdir = @tmpdir@
-+varprefix = @varprefix@
-+
-+man_MANS = rpm.8
-+mandir = @mandir@/fr
-+
-+EXTRA_DIST = $(man_MANS)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = ../../config.h
-+CONFIG_CLEAN_FILES = 
-+man8dir = $(mandir)/man8
-+MANS = $(man_MANS)
-+
-+NROFF = nroff
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = gtar
-+GZIP_ENV = --best
-+all: all-redirect
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+      cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/fr/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+      cd $(top_builddir) \
-+        && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+install-man8:
-+      $(mkinstalldirs) $(DESTDIR)$(man8dir)
-+      @list='$(man8_MANS)'; \
-+      l2='$(man_MANS)'; for i in $$l2; do \
-+        case "$$i" in \
-+          *.8*) list="$$list $$i" ;; \
-+        esac; \
-+      done; \
-+      for i in $$list; do \
-+        if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-+        else file=$$i; fi; \
-+        ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+        inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+        inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+        echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
-+        $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
-+      done
-+
-+uninstall-man8:
-+      @list='$(man8_MANS)'; \
-+      l2='$(man_MANS)'; for i in $$l2; do \
-+        case "$$i" in \
-+          *.8*) list="$$list $$i" ;; \
-+        esac; \
-+      done; \
-+      for i in $$list; do \
-+        ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+        inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+        inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+        echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
-+        rm -f $(DESTDIR)$(man8dir)/$$inst; \
-+      done
-+install-man: $(MANS)
-+      @$(NORMAL_INSTALL)
-+      $(MAKE) $(AM_MAKEFLAGS) install-man8
-+uninstall-man:
-+      @$(NORMAL_UNINSTALL)
-+      $(MAKE) $(AM_MAKEFLAGS) uninstall-man8
-+tags: TAGS
-+TAGS:
-+
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = doc/fr
-+
-+distdir: $(DISTFILES)
-+      @for file in $(DISTFILES); do \
-+        d=$(srcdir); \
-+        if test -d $$d/$$file; then \
-+          cp -pr $$d/$$file $(distdir)/$$file; \
-+        else \
-+          test -f $(distdir)/$$file \
-+          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+          || cp -p $$d/$$file $(distdir)/$$file || :; \
-+        fi; \
-+      done
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am:
-+install-exec: install-exec-am
-+
-+install-data-am: install-man
-+install-data: install-data-am
-+
-+install-am: all-am
-+      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-man
-+uninstall: uninstall-am
-+all-am: Makefile $(MANS)
-+all-redirect: all-am
-+install-strip:
-+      $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+      $(mkinstalldirs)  $(DESTDIR)$(mandir)/man8
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+      -rm -f Makefile $(CONFIG_CLEAN_FILES)
-+      -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+mostlyclean-am:  mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-generic clean-am
-+      -rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-generic distclean-am
-+      @echo "This command is intended for maintainers to use;"
-+      @echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: install-man8 uninstall-man8 install-man uninstall-man tags \
-+distdir info-am info dvi-am dvi check check-am installcheck-am \
-+installcheck install-exec-am install-exec install-data-am install-data \
-+install-am install uninstall-am uninstall all-redirect all-am all \
-+installdirs mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+@SET_MAKE@
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -uNr rpm-4.0.2.orig/doc/ko/Makefile.am rpm-4.0.2/doc/ko/Makefile.am
---- rpm-4.0.2.orig/doc/ko/Makefile.am  Thu Jan  1 01:00:00 1970
-+++ rpm-4.0.2/doc/ko/Makefile.am       Mon Sep 17 20:52:13 2001
-@@ -0,0 +1,8 @@
-+## Process this file with automake to produce Makefile.in
-+
-+@SET_MAKE@
-+
-+man_MANS      = rpm.8 rpm2cpio.8
-+mandir                = @mandir@/ko
-+
-+EXTRA_DIST    = $(man_MANS)
-diff -uNr rpm-4.0.2.orig/doc/ko/Makefile.in rpm-4.0.2/doc/ko/Makefile.in
---- rpm-4.0.2.orig/doc/ko/Makefile.in  Thu Jan  1 01:00:00 1970
-+++ rpm-4.0.2/doc/ko/Makefile.in       Mon Sep 17 20:52:13 2001
-@@ -0,0 +1,324 @@
-+# Makefile.in generated automatically by automake 1.4 from Makefile.am
-+
-+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+
-+DESTDIR =
-+
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+transform = @program_transform_name@
-+
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_alias = @build_alias@
-+build_triplet = @build@
-+host_alias = @host_alias@
-+host_triplet = @host@
-+target_alias = @target_alias@
-+target_triplet = @target@
-+AR = @AR@
-+AS = @AS@
-+AWK = @AWK@
-+BUILD_RPMNLSTOOLS = @BUILD_RPMNLSTOOLS@
-+BZIP2BIN = @BZIP2BIN@
-+CATALOGS = @CATALOGS@
-+CATOBJEXT = @CATOBJEXT@
-+CC = @CC@
-+CPP = @CPP@
-+CSCOPE = @CSCOPE@
-+CTAGS = @CTAGS@
-+DATADIRNAME = @DATADIRNAME@
-+DBLIBOBJS = @DBLIBOBJS@
-+DBLIBSRCS = @DBLIBSRCS@
-+DLLTOOL = @DLLTOOL@
-+FINDPROVIDES = @FINDPROVIDES@
-+FINDREQUIRES = @FINDREQUIRES@
-+FIXPERMS = @FIXPERMS@
-+GENCAT = @GENCAT@
-+GMOFILES = @GMOFILES@
-+GMSGFMT = @GMSGFMT@
-+GT_NO = @GT_NO@
-+GT_YES = @GT_YES@
-+GZIPBIN = @GZIPBIN@
-+INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
-+INCPATH = @INCPATH@
-+INSTOBJEXT = @INSTOBJEXT@
-+INTLDEPS = @INTLDEPS@
-+INTLLIBS = @INTLLIBS@
-+INTLOBJS = @INTLOBJS@
-+LDFLAGS_STATIC = @LDFLAGS_STATIC@
-+LIBDIR = @LIBDIR@
-+LIBMISC = @LIBMISC@
-+LIBOBJS = @LIBOBJS@
-+LIBRPMALIAS_FILENAME = @LIBRPMALIAS_FILENAME@
-+LIBRPMRC_FILENAME = @LIBRPMRC_FILENAME@
-+LIBS = @LIBS@
-+LIBTOOL = @LIBTOOL@
-+LN_S = @LN_S@
-+LOCALEDIR = @LOCALEDIR@
-+MACROFILES = @MACROFILES@
-+MAKEINFO = @MAKEINFO@
-+MKDIR = @MKDIR@
-+MKDIR_P = @MKDIR_P@
-+MKINSTALLDIRS = @MKINSTALLDIRS@
-+MSGFMT = @MSGFMT@
-+OBJDUMP = @OBJDUMP@
-+PACKAGE = @PACKAGE@
-+PGPBIN = @PGPBIN@
-+POFILES = @POFILES@
-+POSUB = @POSUB@
-+RANLIB = @RANLIB@
-+ROOT_GROUP = @ROOT_GROUP@
-+RPM = @RPM@
-+RPMCANONARCH = @RPMCANONARCH@
-+RPMCANONOS = @RPMCANONOS@
-+RPMCANONVENDOR = @RPMCANONVENDOR@
-+RPMCONFIGDIR = @RPMCONFIGDIR@
-+SYSCONFIGDIR = @SYSCONFIGDIR@
-+TOP_SOURCEDIR = @TOP_SOURCEDIR@
-+U = @U@
-+UNZIPBIN = @UNZIPBIN@
-+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-+USE_NLS = @USE_NLS@
-+VERSION = @VERSION@
-+WITH_APIDOCS = @WITH_APIDOCS@
-+WITH_APIDOCS_TARGET = @WITH_APIDOCS_TARGET@
-+WITH_BZIP2 = @WITH_BZIP2@
-+WITH_PYTHON_SUBDIR = @WITH_PYTHON_SUBDIR@
-+WITH_PYTHON_SUBPACKAGE = @WITH_PYTHON_SUBPACKAGE@
-+__CAT = @__CAT@
-+__CHGRP = @__CHGRP@
-+__CHGRP_RHF = @__CHGRP_RHF@
-+__CHMOD = @__CHMOD@
-+__CHOWN = @__CHOWN@
-+__CHOWN_RHF = @__CHOWN_RHF@
-+__CP = @__CP@
-+__CPIO = @__CPIO@
-+__DOXYGEN = @__DOXYGEN@
-+__GREP = @__GREP@
-+__ID = @__ID@
-+__ID_U = @__ID_U@
-+__INSTALL = @__INSTALL@
-+__LD = @__LD@
-+__MAKE = @__MAKE@
-+__MKDIR = @__MKDIR@
-+__MV = @__MV@
-+__NM = @__NM@
-+__OBJCOPY = @__OBJCOPY@
-+__OBJDUMP = @__OBJDUMP@
-+__PATCH = @__PATCH@
-+__PERL = @__PERL@
-+__PYTHON = @__PYTHON@
-+__RM = @__RM@
-+__RSH = @__RSH@
-+__SED = @__SED@
-+__SSH = @__SSH@
-+__STRIP = @__STRIP@
-+__TAR = @__TAR@
-+l = @l@
-+libdb1 = @libdb1@
-+libdb2 = @libdb2@
-+libdb3 = @libdb3@
-+testdir = @testdir@
-+tmpdir = @tmpdir@
-+varprefix = @varprefix@
-+
-+man_MANS = rpm.8 rpm2cpio.8
-+mandir = @mandir@/ko
-+
-+EXTRA_DIST = $(man_MANS)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_HEADER = ../../config.h
-+CONFIG_CLEAN_FILES = 
-+man8dir = $(mandir)/man8
-+MANS = $(man_MANS)
-+
-+NROFF = nroff
-+DIST_COMMON =  Makefile.am Makefile.in
-+
-+
-+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+
-+TAR = gtar
-+GZIP_ENV = --best
-+all: all-redirect
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-+      cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/ko/Makefile
-+
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+      cd $(top_builddir) \
-+        && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-+
-+
-+install-man8:
-+      $(mkinstalldirs) $(DESTDIR)$(man8dir)
-+      @list='$(man8_MANS)'; \
-+      l2='$(man_MANS)'; for i in $$l2; do \
-+        case "$$i" in \
-+          *.8*) list="$$list $$i" ;; \
-+        esac; \
-+      done; \
-+      for i in $$list; do \
-+        if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-+        else file=$$i; fi; \
-+        ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+        inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+        inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+        echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst"; \
-+        $(INSTALL_DATA) $$file $(DESTDIR)$(man8dir)/$$inst; \
-+      done
-+
-+uninstall-man8:
-+      @list='$(man8_MANS)'; \
-+      l2='$(man_MANS)'; for i in $$l2; do \
-+        case "$$i" in \
-+          *.8*) list="$$list $$i" ;; \
-+        esac; \
-+      done; \
-+      for i in $$list; do \
-+        ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-+        inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-+        inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-+        echo " rm -f $(DESTDIR)$(man8dir)/$$inst"; \
-+        rm -f $(DESTDIR)$(man8dir)/$$inst; \
-+      done
-+install-man: $(MANS)
-+      @$(NORMAL_INSTALL)
-+      $(MAKE) $(AM_MAKEFLAGS) install-man8
-+uninstall-man:
-+      @$(NORMAL_UNINSTALL)
-+      $(MAKE) $(AM_MAKEFLAGS) uninstall-man8
-+tags: TAGS
-+TAGS:
-+
-+
-+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-+
-+subdir = doc/ko
-+
-+distdir: $(DISTFILES)
-+      @for file in $(DISTFILES); do \
-+        d=$(srcdir); \
-+        if test -d $$d/$$file; then \
-+          cp -pr $$d/$$file $(distdir)/$$file; \
-+        else \
-+          test -f $(distdir)/$$file \
-+          || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-+          || cp -p $$d/$$file $(distdir)/$$file || :; \
-+        fi; \
-+      done
-+info-am:
-+info: info-am
-+dvi-am:
-+dvi: dvi-am
-+check-am: all-am
-+check: check-am
-+installcheck-am:
-+installcheck: installcheck-am
-+install-exec-am:
-+install-exec: install-exec-am
-+
-+install-data-am: install-man
-+install-data: install-data-am
-+
-+install-am: all-am
-+      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+install: install-am
-+uninstall-am: uninstall-man
-+uninstall: uninstall-am
-+all-am: Makefile $(MANS)
-+all-redirect: all-am
-+install-strip:
-+      $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-+installdirs:
-+      $(mkinstalldirs)  $(DESTDIR)$(mandir)/man8
-+
-+
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+      -rm -f Makefile $(CONFIG_CLEAN_FILES)
-+      -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+
-+maintainer-clean-generic:
-+mostlyclean-am:  mostlyclean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+clean-am:  clean-generic mostlyclean-am
-+
-+clean: clean-am
-+
-+distclean-am:  distclean-generic clean-am
-+      -rm -f libtool
-+
-+distclean: distclean-am
-+
-+maintainer-clean-am:  maintainer-clean-generic distclean-am
-+      @echo "This command is intended for maintainers to use;"
-+      @echo "it deletes files that may require special tools to rebuild."
-+
-+maintainer-clean: maintainer-clean-am
-+
-+.PHONY: install-man8 uninstall-man8 install-man uninstall-man tags \
-+distdir info-am info dvi-am dvi check check-am installcheck-am \
-+installcheck install-exec-am install-exec install-data-am install-data \
-+install-am install uninstall-am uninstall all-redirect all-am all \
-+installdirs mostlyclean-generic distclean-generic clean-generic \
-+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+
-+
-+@SET_MAKE@
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -uNr rpm-4.0.2.orig/doc/pl/Makefile.am rpm-4.0.2/doc/pl/Makefile.am
---- rpm-4.0.2.orig/doc/pl/Makefile.am  Tue Jul 20 00:13:12 1999
-+++ rpm-4.0.2/doc/pl/Makefile.am       Mon Sep 17 20:52:13 2001
-@@ -2,7 +2,7 @@
- 
- @SET_MAKE@
- 
--man_MANS      = rpm.8
-+man_MANS      = rpm.8 rpm2cpio.8
- mandir                = @mandir@/pl
- 
- EXTRA_DIST    = $(man_MANS)
-diff -uNr rpm-4.0.2.orig/doc/pl/Makefile.in rpm-4.0.2/doc/pl/Makefile.in
---- rpm-4.0.2.orig/doc/pl/Makefile.in  Tue Mar 13 14:19:02 2001
-+++ rpm-4.0.2/doc/pl/Makefile.in       Mon Sep 17 20:52:52 2001
-@@ -169,7 +169,7 @@
- tmpdir = @tmpdir@
- varprefix = @varprefix@
- 
--man_MANS = rpm.8
-+man_MANS = rpm.8 rpm2cpio.8
- mandir = @mandir@/pl
- 
- EXTRA_DIST = $(man_MANS)

diff --git a/rpm-python-amfix.patch b/rpm-python-amfix.patch
deleted file mode 100644 (file)
index 1aa12e9..0000000
--- a/rpm-python-amfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- rpm-4.0.4/python/Makefile.am.wiget2        Tue Feb 12 23:20:17 2002
-+++ rpm-4.0.4/python/Makefile.am       Tue Feb 12 23:21:09 2002
-@@ -34,10 +34,10 @@
- noinst_LTLIBRARIES = librpmmodule.la
- librpmmodule_la_SOURCES = rpmmodule.c hash.c upgrade.c
- 
--rpmmodule.so: $(librpmmodule_la_OBJECTS)
-+rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS)
-       $(LINK) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS)
- 
--poptmodule.so: $(poptmodule_so_OBJECTS)
-+poptmodule.so$(EXEEXT): $(poptmodule_so_OBJECTS)
-       $(LINK) -o $@ $(poptmodule_so_OBJECTS) $(poptmodule_so_LDFLAGS)
- 
- .PHONY:       lclint