- updated for 4.4.2

Changed files:
    rpm-php-deps.patch -> 1.4
    rpm-system_libs-more.patch -> 1.6

diff --git a/rpm-php-deps.patch b/rpm-php-deps.patch
index 4d4e0febfeacc31fc8d17caa7ffc4079d183ff16..14b73c5fa4cfde48aed881d59938c58d79c54ce8 100644 (file)
--- a/rpm-php-deps.patch
+++ b/rpm-php-deps.patch
@@ -1,15 +1,15 @@
---- rpm-4.2/build/rpmfc.c.wiget        Mon Jan 20 23:16:09 2003
-+++ rpm-4.2/build/rpmfc.c      Tue Apr  1 09:56:51 2003
-@@ -450,6 +450,8 @@
+--- 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 @@
  
    { "perl script text",               RPMFC_PERL|RPMFC_INCLUDE },
    { "Perl5 module source text", RPMFC_PERL|RPMFC_MODULE|RPMFC_INCLUDE },
 +  
 +  { "PHP script text",                RPMFC_PHP|RPMFC_INCLUDE },
  
-   { "current ar archive",     RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE },
+   { " /usr/bin/python",               RPMFC_PYTHON|RPMFC_INCLUDE },
  
-@@ -618,6 +621,7 @@
+@@ -624,6 +626,7 @@
  
        fc->sb_java = freeStringBuf(fc->sb_java);
        fc->sb_perl = freeStringBuf(fc->sb_perl);
@@ -17,17 +17,17 @@
        fc->sb_python = freeStringBuf(fc->sb_python);
  
      }
-@@ -705,6 +709,8 @@
+@@ -711,6 +714,8 @@
            fc->fcolor->vals[fc->ix] |= RPMFC_PERL;
-       else if (!strcmp(bn, "python"))
+       else if (!strncmp(bn, "python", sizeof("python")-1))
            fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
 +      else if (!strcmp(bn, "php"))
 +          fc->fcolor->vals[fc->ix] |= RPMFC_PHP;
  
        break;
      }
-@@ -723,6 +729,10 @@
-       if (is_executable)
+@@ -731,6 +736,10 @@
+ #endif
            xx = rpmfcHelper(fc, 'R', "python");
      }
 +    if (fc->fcolor->vals[fc->ix] & RPMFC_PHP) {
@@ -37,7 +37,7 @@
  
      return 0;
  }
-@@ -1068,6 +1068,7 @@
+@@ -1059,6 +1068,7 @@
      { rpmfcELF,               RPMFC_ELF },
      { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PERL) },
      { rpmfcSCRIPT,    (RPMFC_SCRIPT|RPMFC_PYTHON) },
@@ -45,16 +45,16 @@
      { NULL, 0 }
  };
  
-@@ -1227,6 +1227,9 @@
+@@ -1228,6 +1238,9 @@
  /*@-branchstate@*/
-       if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
-           ftype = "Perl5 module source text";
-+      /* 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 = "";
+           if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
+               ftype = "Perl5 module source text";
++          /* 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 = "";
 --- rpm-4.2/build/rpmfc.h.wiget        Tue Apr  1 10:00:23 2003
 +++ rpm-4.2/build/rpmfc.h      Tue Apr  1 10:01:22 2003
 @@ -40,6 +40,7 @@

diff --git a/rpm-system_libs-more.patch b/rpm-system_libs-more.patch
index 983783091a94b01a62b25917ef09cffbc8cbbfc8..a9beb07e538ef348a58ffa76f030f69d56869dc5 100644 (file)
--- a/rpm-system_libs-more.patch
+++ b/rpm-system_libs-more.patch
@@ -1,12 +1,11 @@
-diff -urN rpm-4.3.org/Makefile.am rpm-4.3/Makefile.am
---- rpm-4.3.org/Makefile.am    2003-12-28 01:33:43.917858224 +0100
-+++ rpm-4.3/Makefile.am        2003-12-28 02:01:02.060822640 +0100
-@@ -14,7 +14,7 @@
+--- rpm-4.4.2/Makefile.am.orig 2005-07-23 13:43:15.166991248 +0200
++++ rpm-4.4.2/Makefile.am      2005-07-23 13:45:33.725927088 +0200
+@@ -15,7 +15,7 @@
        po/*.in po/*.po po/rpm.pot \
        rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c
  
--SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_DB_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
-+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ file @WITH_BEECRYPT_SUBDIR@ lua rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
+-SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
++SUBDIRS = intl po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts tests doc .
  
  INCLUDES = \
        -I$(top_srcdir)/build \