Author: qboosh Date: Fri Nov 18 21:59:07 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 4.4.3
---- Files affected:
SOURCES:
rpm-php-deps.patch (1.4 -> 1.5)
---- Diffs:
================================================================
Index: SOURCES/rpm-php-deps.patch
diff -u SOURCES/rpm-php-deps.patch:1.4 SOURCES/rpm-php-deps.patch:1.5
--- SOURCES/rpm-php-deps.patch:1.4 Sat Jul 23 13:41:56 2005
+++ SOURCES/rpm-php-deps.patch Fri Nov 18 22:59:02 2005
@@ -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 @@
+ /[EMAIL PROTECTED]@*/
+ 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 @@
- /[EMAIL PROTECTED]@*/
- 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 = "";
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/rpm-php-deps.patch?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
