- updated for 4.4.3

Changed files:
    rpm-perl_req.patch -> 1.3
    rpm-php-deps.patch -> 1.5
    rpm-po.patch -> 1.11

diff --git a/rpm-perl_req.patch b/rpm-perl_req.patch
index edb29ffa194576cc553179aa914c43043deaf100..ee73083ddab36d6264798afc5b7d97a60b685095 100644 (file)
--- a/rpm-perl_req.patch
+++ b/rpm-perl_req.patch
@@ -1,5 +1,5 @@
---- rpm-4.2/scripts/perl.req~  Fri Jul 11 11:54:15 2003
-+++ rpm-4.2/scripts/perl.req   Sat Jul 12 14:48:40 2003
+--- rpm-4.4.3/scripts/perl.req.orig    2005-11-18 23:00:58.604519312 +0100
++++ rpm-4.4.3/scripts/perl.req 2005-11-18 23:03:17.506403016 +0100
 @@ -57,7 +57,7 @@
  foreach $module (sort keys %require) {
    if (length($require{$module}) == 0) {
@@ -9,17 +9,17 @@
       } else {
           print "perl($module)\n";
       }
-@@ -243,11 +243,11 @@
-       # to mean that a particular version of perl is specified
+@@ -255,11 +255,11 @@
  
-       if ($module =~ /5.00/) {
--        print "perl >= 0:$module\n";
-+        print "perl-base >= 0:$module\n";
+       my $ver=$1;
+       if ($ver =~ /5.00/) {
+-        print "perl >= 0:$ver\n";
++        print "perl-base >= 0:$ver\n";
          next;
        }
        else {
--        print "perl >= 1:$module\n";
-+        print "perl-base >= 1:$module\n";
+-        print "perl >= 1:$ver\n";
++        print "perl-base >= 1:$ver\n";
          next;
        }
  

diff --git a/rpm-php-deps.patch b/rpm-php-deps.patch
index 14b73c5fa4cfde48aed881d59938c58d79c54ce8..894f7e5918b89f60618aefc42798387de2c5d023 100644 (file)
--- a/rpm-php-deps.patch
+++ b/rpm-php-deps.patch
@@ -1,15 +1,15 @@
---- rpm-4.4.2/build/rpmfc.c.orig       2005-07-21 03:04:55.000000000 +0200
-+++ rpm-4.4.2/build/rpmfc.c    2005-07-23 13:48:23.419129800 +0200
-@@ -451,6 +451,8 @@
+--- rpm-4.4.3/build/rpmfc.c.orig       2005-11-14 23:57:52.000000000 +0100
++++ rpm-4.4.3/build/rpmfc.c    2005-11-18 22:58:12.581758608 +0100
+@@ -449,6 +449,8 @@
  
    { "perl script text",               RPMFC_PERL|RPMFC_INCLUDE },
    { "Perl5 module source text", RPMFC_PERL|RPMFC_MODULE|RPMFC_INCLUDE },
 +  
 +  { "PHP script text",                RPMFC_PHP|RPMFC_INCLUDE },
  
-   { " /usr/bin/python",               RPMFC_PYTHON|RPMFC_INCLUDE },
- 
-@@ -624,6 +626,7 @@
+   /* XXX "a /usr/bin/python -t script text executable" */
+   /* XXX "python 2.3 byte-compiled" */
+@@ -629,6 +631,7 @@
  
        fc->sb_java = freeStringBuf(fc->sb_java);
        fc->sb_perl = freeStringBuf(fc->sb_perl);
@@ -17,7 +17,7 @@
        fc->sb_python = freeStringBuf(fc->sb_python);
  
      }
-@@ -711,6 +714,8 @@
+@@ -718,6 +721,8 @@
            fc->fcolor->vals[fc->ix] |= RPMFC_PERL;
        else if (!strncmp(bn, "python", sizeof("python")-1))
            fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
@@ -26,9 +26,9 @@
  
        break;
      }
-@@ -731,6 +736,10 @@
- #endif
-           xx = rpmfcHelper(fc, 'R', "python");
+@@ -759,6 +764,10 @@
+       if (is_executable)
+           xx = rpmfcHelper(fc, 'R', "executable");
      }
 +    if (fc->fcolor->vals[fc->ix] & RPMFC_PHP) {
 +              xx = rpmfcHelper(fc, 'P', "php");
@@ -37,21 +37,23 @@
  
      return 0;
  }
-@@ -1059,6 +1068,7 @@
+@@ -835,7 +844,7 @@
+ /*@unchecked@*/
+ static struct rpmfcApplyTbl_s rpmfcApplyTable[] = {
      { rpmfcELF,               RPMFC_ELF },
-     { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PERL) },
-     { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PYTHON) },
-+    { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PHP) },
+-    { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA) },
++    { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP) },
      { NULL, 0 }
  };
  
-@@ -1228,6 +1238,9 @@
- /*@-branchstate@*/
-           if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
-               ftype = "Perl5 module source text";
+@@ -1027,6 +1036,10 @@
+           else if (slen >= sizeof(".pc") && !strcmp(s+slen-(sizeof(".pc")-1), ".pm"))
+               ftype = "pkgconfig file";
+ 
 +          /* XXX all files with extension ".php" are PHP modules for now. */
 +          else if (slen >= sizeof(".php") && !strcmp(s+slen-(sizeof(".php")-1), ".php"))
 +              ftype = "PHP script text";
++
            /* XXX skip all files in /dev/ which are (or should be) %dev dummies. */
            else if (slen >= fc->brlen+sizeof("/dev/") && !strncmp(s+fc->brlen, "/dev/", sizeof("/dev/")-1))
                ftype = "";

diff --git a/rpm-po.patch b/rpm-po.patch
index 4556ec6f435420ac99af68fbfdcd332985b5b097..5b2e03b9f14a4b1f507c41334af150ec9d4fe98a 100644 (file)
--- a/rpm-po.patch
+++ b/rpm-po.patch
@@ -1,17 +1,17 @@
---- rpm-4.3/configure.ac.orig  2004-02-01 20:53:09.000000000 +0100
-+++ rpm-4.3/configure.ac       2004-02-01 21:22:12.430982800 +0100
-@@ -37,7 +37,7 @@
- AM_INIT_AUTOMAKE([foreign])
+--- rpm-4.4.3/configure.ac.orig        2005-11-18 23:04:14.916675328 +0100
++++ rpm-4.4.3/configure.ac     2005-11-18 23:05:28.163540112 +0100
+@@ -42,7 +42,7 @@
+ AC_SUBST(LT_AGE, 0)
  
  dnl Set of available languages.
--ALL_LINGUAS="cs da de fi fr gl is ja ko no pl pt pt_BR ro ru sk sl sr sv tr"
-+ALL_LINGUAS="cs da de fi fr gl is ja ko nb pl pt pt_BR ro ru sk sl sr@Latn sv tr"
+-ALL_LINGUAS="cs da de fi fr gl is ja ko no pl pt pt_BR ro ru sk sl sr sv tr uk"
++ALL_LINGUAS="cs da de fi fr gl is ja ko nb pl pt pt_BR ro ru sk sl sr@Latn sv tr uk"
  
  dnl Checks for programs.
  AC_PROG_CXX
---- rpm-4.4.2/po/de.po.orig    2005-07-21 03:48:42.000000000 +0200
-+++ rpm-4.4.2/po/de.po 2005-07-23 15:25:11.869111184 +0200
-@@ -1568,7 +1568,7 @@
+--- rpm-4.4.3/po/de.po.orig    2005-11-17 13:24:18.000000000 +0100
++++ rpm-4.4.3/po/de.po 2005-11-18 23:06:16.517189240 +0100
+@@ -1610,7 +1610,7 @@
  #: lib/fsm.c:1354
  #, c-format
  msgid "%s directory created with perms %04o, context %s.\n"
@@ -20,23 +20,23 @@
  
  #: lib/fsm.c:1657
  #, c-format
-@@ -2038,12 +2038,12 @@
- #: lib/poptI.c:277
+@@ -2101,12 +2101,12 @@
+ #: lib/poptI.c:340
  #, c-format
  msgid "do not execute %%preun scriptlet (if any)"
 -msgstr "%preun-Skriptlet nicht ausführen (wenn vorhanden)"
 +msgstr "%%preun-Skriptlet nicht ausführen (wenn vorhanden)"
  
- #: lib/poptI.c:280
+ #: lib/poptI.c:343
  #, c-format
  msgid "do not execute %%postun scriptlet (if any)"
 -msgstr "%postun-Skriptlet nicht ausführen (wenn vorhanden)"
 +msgstr "%%postun-Skriptlet nicht ausführen (wenn vorhanden)"
  
- #: lib/poptI.c:290
+ #: lib/poptI.c:353
  msgid "do not execute any scriptlet(s) triggered by this package"
-@@ -3302,7 +3302,7 @@
- #: lib/signature.c:612
+@@ -3482,7 +3482,7 @@
+ #: lib/signature.c:614
  #, c-format
  msgid "gpg exec failed (%d)\n"
 -msgstr "GPG fehlgeschlagen\n"
@@ -44,7 +44,7 @@
  
  #. GPG failed to write signature
  #. Just in case
-@@ -3592,12 +3592,12 @@
+@@ -3843,12 +3843,12 @@
  #: rpmdb/db3.c:189
  #, c-format
  msgid "closed   db environment %s/%s\n"
@@ -59,12 +59,12 @@
  
  #: rpmdb/db3.c:298
  #, c-format
-@@ -3812,7 +3812,7 @@
- #: rpmdb/rpmdb.c:2696
+@@ -4067,7 +4067,7 @@
+ #: rpmdb/rpmdb.c:2714
  #, c-format
  msgid "error(%d) setting header #%d record for %s removal\n"
 -msgstr "Fehler(%d) beim Markieren des Header-Eintrags #%d zur Entfernung\n"
 +msgstr "Fehler(%d) beim Markieren des Header-Eintrags #%d zur Entfernung %s\n"
  
- #: rpmdb/rpmdb.c:2811
+ #: rpmdb/rpmdb.c:2822
  #, c-format