---- 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.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 },
- { "current ar archive", RPMFC_STATIC|RPMFC_LIBRARY|RPMFC_ARCHIVE|RPMFC_INCLUDE },
-
-@@ -618,6 +621,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);
fc->sb_python = freeStringBuf(fc->sb_python);
}
-@@ -705,6 +709,8 @@
+@@ -718,6 +721,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 @@
+@@ -759,6 +764,10 @@
if (is_executable)
- xx = rpmfcHelper(fc, 'R', "python");
+ xx = rpmfcHelper(fc, 'R', "executable");
}
+ if (fc->fcolor->vals[fc->ix] & RPMFC_PHP) {
+ xx = rpmfcHelper(fc, 'P', "php");
return 0;
}
-@@ -1029,7 +1039,7 @@
+@@ -835,7 +844,7 @@
/*@unchecked@*/
static struct rpmfcApplyTbl_s rpmfcApplyTable[] = {
{ rpmfcELF, RPMFC_ELF },
-- { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL) },
-+ { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL|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 }
};
-@@ -1167,6 +1177,10 @@
- if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
- strcpy(fm->obuf, "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. */
-+ if (slen >= sizeof(".php") && !strcmp(s+slen-(sizeof(".php")-1), ".php"))
-+ strcpy(fm->obuf, "PHP script 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";
+
- se = fm->obuf;
- rpmMessage(RPMMESS_DEBUG, "%s: %s\n", s, se);
-
+ /* 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 @@