- updated for 4.4.8

Changed files:
    rpm-doxygen_hack.patch -> 1.8
    rpm-pld-autodep.patch -> 1.17
    rpm-rpmpopt.patch -> 1.23

diff --git a/rpm-doxygen_hack.patch b/rpm-doxygen_hack.patch
index 93e3d6b3b536386fe46a8d417f6721958b2cd828..5702471ae54016f2e816aaffcd4604d5a5e90159 100644 (file)
--- a/rpm-doxygen_hack.patch
+++ b/rpm-doxygen_hack.patch
@@ -1,6 +1,6 @@
---- rpm-4.4.6/Doxyfile.in.orig 2006-03-30 03:31:41.000000000 +0200
-+++ rpm-4.4.6/Doxyfile.in      2006-04-17 18:04:54.724431250 +0200
-@@ -470,29 +470,7 @@
+--- rpm-4.4.8/Doxyfile.in.orig 2007-01-14 21:48:16.000000000 +0100
++++ rpm-4.4.8/Doxyfile.in      2007-04-08 19:17:10.847624739 +0200
+@@ -470,27 +470,7 @@
                           @top_srcdir@/rpmrc \
                           @top_srcdir@/rpm2cpio.c \
                           @top_srcdir@/system.h \
@@ -23,15 +23,13 @@
 -                         @top_srcdir@/build/poptBT.c \
 -                         @top_srcdir@/build/reqprov.c \
 -                         @top_srcdir@/build/rpmbuild.h \
--                         @top_srcdir@/build/rpmfc.c \
--                         @top_srcdir@/build/rpmfc.h \
 -                         @top_srcdir@/build/rpmspec.h \
 -                         @top_srcdir@/build/spec.c \
 +                         @top_srcdir@/build/ \
                           @top_srcdir@/doc/manual/builddependencies \
                           @top_srcdir@/doc/manual/buildroot \
                           @top_srcdir@/doc/manual/conditionalbuilds \
-@@ -507,195 +485,12 @@
+@@ -505,190 +485,12 @@
                           @top_srcdir@/doc/manual/spec \
                           @top_srcdir@/doc/manual/triggers \
                           @top_srcdir@/doc/manual/tsort \
@@ -77,6 +75,8 @@
 -                         @top_srcdir@/lib/rpmcli.h \
 -                         @top_srcdir@/lib/rpmds.c \
 -                         @top_srcdir@/lib/rpmds.h \
+-                         @top_srcdir@/lib/rpmfc.c \
+-                         @top_srcdir@/lib/rpmfc.h \
 -                         @top_srcdir@/lib/rpmfi.c \
 -                         @top_srcdir@/lib/rpmfi.h \
 -                         @top_srcdir@/lib/rpmgi.c \
@@ -156,8 +156,6 @@
 -                         @top_srcdir@/rpmdb/legacy.h \
 -                         @top_srcdir@/rpmdb/merge.c \
 -                         @top_srcdir@/rpmdb/poptDB.c \
--                         @top_srcdir@/rpmdb/rpmhash.c \
--                         @top_srcdir@/rpmdb/rpmhash.h \
 -                         @top_srcdir@/rpmdb/rpmdb.c \
 -                         @top_srcdir@/rpmdb/rpmdb.h \
 -                         @top_srcdir@/rpmdb/tagname.c \
@@ -167,10 +165,13 @@
 -                         @top_srcdir@/rpmio/digest.c \
 -                         @top_srcdir@/rpmio/fts.c \
 -                         @top_srcdir@/rpmio/fts.h \
+-                         @top_srcdir@/rpmio/lookup3.c \
 -                         @top_srcdir@/rpmio/macro.c \
 -                         @top_srcdir@/rpmio/rpmlog.c \
 -                         @top_srcdir@/rpmio/rpmlog.h \
 -                         @top_srcdir@/rpmio/rpmerr.h \
+-                         @top_srcdir@/rpmio/rpmhash.c \
+-                         @top_srcdir@/rpmio/rpmhash.h \
 -                         @top_srcdir@/rpmio/rpmio.c \
 -                         @top_srcdir@/rpmio/rpmio.h \
 -                         @top_srcdir@/rpmio/rpmio_internal.h \
@@ -215,15 +216,7 @@
 -                         @top_srcdir@/python/rpmte-py.h \
 -                         @top_srcdir@/python/rpmts-py.c \
 -                         @top_srcdir@/python/rpmts-py.h \
--                         @top_srcdir@/tools/dumpdb.c \
--                         @top_srcdir@/tools/javadeps.c \
--                         @top_srcdir@/tools/rpmcache.c \
--                         @top_srcdir@/tools/rpmdeps.c \
--                         @top_srcdir@/tools/rpmgraph.c \
--                         @top_srcdir@/tools/rpminject.c \
--                         @top_srcdir@/tools/rpmtool.c \
--                         @top_srcdir@/tools/rpmxml.c \
--                         @top_srcdir@/tools/rpmxp.c
+-                         @top_srcdir@/tools/rpmdeps.c
 +                         @top_srcdir@/lib/ \
 +                       @top_srcdir@/lua/ \
 +                         @top_srcdir@/rpmdb/ \
@@ -233,7 +226,7 @@
  
  # If the value of the INPUT tag contains directories, you can use the 
  # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
-@@ -704,8 +499,8 @@
+@@ -697,8 +499,8 @@
  # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
  # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
  

diff --git a/rpm-pld-autodep.patch b/rpm-pld-autodep.patch
index 8ec40bdbcb7c6aa663ea2a5a55fe69ce7529b4c0..846df7e6ddf5e8fba1da36e2390ebb06481221fb 100644 (file)
--- a/rpm-pld-autodep.patch
+++ b/rpm-pld-autodep.patch
@@ -1,5 +1,5 @@
---- rpm-4.4.3/build/rpmfc.h.orig       2005-11-18 23:08:14.231293000 +0100
-+++ rpm-4.4.3/build/rpmfc.h    2005-11-18 23:55:16.694214392 +0100
+--- rpm-4.4.8/lib/rpmfc.h.orig 2005-11-18 23:08:14.231293000 +0100
++++ rpm-4.4.8/lib/rpmfc.h      2005-11-18 23:55:16.694214392 +0100
 @@ -1,6 +1,7 @@
  #ifndef _H_RPMFC_
  #define _H_RPMFC_
@@ -20,9 +20,9 @@
  };
  
  /**
---- rpm-4.4.3/build/rpmfc.c.orig       2005-11-19 09:33:23.180067024 +0100
-+++ rpm-4.4.3/build/rpmfc.c    2005-11-19 09:35:29.167913960 +0100
-@@ -9,6 +9,8 @@
+--- rpm-4.4.8/lib/rpmfc.c.orig 2007-04-08 18:54:35.134367044 +0200
++++ rpm-4.4.8/lib/rpmfc.c      2007-04-08 19:10:18.196109070 +0200
+@@ -11,6 +11,8 @@
  #define       _RPMDS_INTERNAL
  #include <rpmds.h>
  #include <rpmfi.h>
@@ -31,7 +31,7 @@
  
  #include "debug.h"
  
-@@ -299,14 +301,83 @@
+@@ -305,14 +307,83 @@
      return buf;
  };
  
@@ -116,7 +116,7 @@
        /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
        /*@modifies fc, rpmGlobalMacroContext, fileSystem, internalState @*/
  {
-@@ -392,6 +464,8 @@
+@@ -398,6 +469,8 @@
            }
  /*@=branchstate@*/
  
@@ -125,7 +125,7 @@
  
            /* Add tracking dependency for versioned Provides: */
            if (!fc->tracked && deptype == 'P' && *EVR != '\0') {
-@@ -703,7 +777,7 @@
+@@ -710,7 +783,7 @@
        *se = '\0';
        se++;
  
@@ -134,7 +134,7 @@
            /* Add to package requires. */
            ds = rpmdsSingle(RPMTAG_REQUIRENAME, s, "", RPMSENSE_FIND_REQUIRES);
            xx = rpmdsMerge(&fc->requires, ds);
-@@ -731,42 +804,50 @@
+@@ -738,43 +811,51 @@
      (void) fclose(fp);
  
      if (fc->fcolor->vals[fc->ix] & RPMFC_PERL) {
@@ -188,18 +188,19 @@
 -          xx = rpmfcHelper(fc, 'R', "executable");
 +      if (fc->findreq && is_executable)
 +          xx = rpmfcHelper(fc, 'R', "executable", fc->noautoreq, fc->noautoreq_c);
-     }
+     } else
      if (fc->fcolor->vals[fc->ix] & RPMFC_PHP) {
--              xx = rpmfcHelper(fc, 'P', "php");
+-      xx = rpmfcHelper(fc, 'P', "php");
++      if (fc->findprov)
++      xx = rpmfcHelper(fc, 'P', "php", fc->noautoprov, fc->noautoprov_c);
+       /* not only executable, files run by httpd usually are not */
 -          xx = rpmfcHelper(fc, 'R', "php");
-+          if (fc->findprov)
-+              xx = rpmfcHelper(fc, 'P', "php", fc->noautoprov, fc->noautoprov_c);
-+          if (fc->findreq)
-+          xx = rpmfcHelper(fc, 'R', "php", fc->noautoreq, fc->noautoreq_c);
-       }
++      if (fc->findreq)
++          xx = rpmfcHelper(fc, 'R', "php". fc->noautoreq, fc->noautoreq_c);
+     }
  
      return 0;
-@@ -794,20 +875,26 @@
+@@ -802,20 +883,26 @@
      default:
        break;
      case RPMTAG_PROVIDENAME:
@@ -226,7 +227,7 @@
        break;
      }
      return rc;
-@@ -848,6 +935,109 @@
+@@ -856,6 +943,109 @@
      { NULL, 0 }
  };
  
@@ -336,7 +337,7 @@
  int rpmfcApply(rpmfc fc)
  {
      rpmfcApplyTbl fcat;
-@@ -865,6 +1055,26 @@
+@@ -874,6 +1064,26 @@
      int i;
      int xx;
      int skipping;
@@ -363,7 +364,7 @@
  
      /* Generate package and per-file dependencies. */
      for (fc->ix = 0; fc->fn[fc->ix] != NULL; fc->ix++) {
-@@ -1076,9 +1076,43 @@
+@@ -894,9 +1104,43 @@
        for (fcat = rpmfcApplyTable; fcat->func != NULL; fcat++) {
            if (!(fc->fcolor->vals[fc->ix] & fcat->colormask))
                /*@innercontinue@*/ continue;
@@ -413,7 +414,7 @@
  build/parseSpec.c
  build/poptBT.c
  build/reqprov.c
-+build/rpmfc.c
++lib/rpmfc.c
  build/spec.c
  lib/cpio.c
  lib/depends.c

diff --git a/rpm-rpmpopt.patch b/rpm-rpmpopt.patch
index f3adb43f3072293f63da318333e0cbc192bd24c2..c523c2231bcb6ca2d11a564f2cc76df3913dd8b4 100644 (file)
--- a/rpm-rpmpopt.patch
+++ b/rpm-rpmpopt.patch
@@ -32,24 +32,24 @@
  #==============================================================================
  rpmd  alias --dbpath          --define '_dbpath !#:+' \
        --POPTdesc=$"use database in DIRECTORY" \
---- rpm-4.4.2/po/pl.po.orig    2005-07-23 14:59:24.279380584 +0200
-+++ rpm-4.4.2/po/pl.po 2005-07-23 15:08:13.952857976 +0200
-@@ -4387,6 +4387,18 @@
+--- rpm-4.4.8/po/pl.po.orig    2007-04-08 15:56:32.413593481 +0200
++++ rpm-4.4.8/po/pl.po 2007-04-08 15:57:53.630221753 +0200
+@@ -4588,6 +4588,18 @@
  msgid "disable configure <option> for build"
  msgstr "wy³±cz <opcjê> konfiguracji przy budowaniu"
  
-+#: ../rpmpopt:251
++#: rpmpopt:251
 +msgid "make all needed dirs for building binary rpms"
 +msgstr "utwórz wszystkie katalogi potrzebne do budowania binarnych RPM-ów"
 +
-+#: ../rpmpopt:254
++#: rpmpopt:254
 +msgid "build packages with debug information"
 +msgstr "buduj pakiety z informacjami do odpluskwiania"
 +
-+#: ../rpmpopt:257
++#: rpmpopt:257
 +msgid "find all --with/--without values"
 +msgstr "znajd¼ wszystkie warto¶ci --with/--without"
 +
- #: ../rpmpopt:186 ../rpmpopt:201 ../rpmpopt:216 ../rpmpopt:224 ../rpmpopt:232
- #: ../rpmpopt:240 ../rpmpopt:248 ../rpmpopt:256 ../rpmpopt:264 ../rpmpopt:337
- #: ../rpmpopt:409 ../rpmpopt:417
+ #: rpmpopt:262 rpmpopt:277 rpmpopt:295 rpmpopt:303 rpmpopt:311
+ #: rpmpopt:319 rpmpopt:327 rpmpopt:335 rpmpopt:343 rpmpopt:454
+ #: rpmpopt:564 rpmpopt:572