]> git.pld-linux.org Git - packages/rpm.git/blame - rpm-php-deps.patch
- updated for 4.4.8
[packages/rpm.git] / rpm-php-deps.patch
CommitLineData
986c2b93
JB
1--- rpm-4.4.3/build/rpmfc.c.orig 2005-11-14 23:57:52.000000000 +0100
2+++ rpm-4.4.3/build/rpmfc.c 2005-11-18 22:58:12.581758608 +0100
3@@ -449,6 +449,8 @@
ff5da8bf
AF
4
5 { "perl script text", RPMFC_PERL|RPMFC_INCLUDE },
6 { "Perl5 module source text", RPMFC_PERL|RPMFC_MODULE|RPMFC_INCLUDE },
7+
8+ { "PHP script text", RPMFC_PHP|RPMFC_INCLUDE },
9
986c2b93
JB
10 /* XXX "a /usr/bin/python -t script text executable" */
11 /* XXX "python 2.3 byte-compiled" */
12@@ -629,6 +631,7 @@
ff5da8bf
AF
13
14 fc->sb_java = freeStringBuf(fc->sb_java);
15 fc->sb_perl = freeStringBuf(fc->sb_perl);
16+ fc->sb_php = freeStringBuf(fc->sb_php);
17 fc->sb_python = freeStringBuf(fc->sb_python);
18
19 }
986c2b93 20@@ -718,6 +721,8 @@
ff5da8bf 21 fc->fcolor->vals[fc->ix] |= RPMFC_PERL;
df271ccb 22 else if (!strncmp(bn, "python", sizeof("python")-1))
ff5da8bf
AF
23 fc->fcolor->vals[fc->ix] |= RPMFC_PYTHON;
24+ else if (!strcmp(bn, "php"))
25+ fc->fcolor->vals[fc->ix] |= RPMFC_PHP;
26
27 break;
28 }
986c2b93
JB
29@@ -759,6 +764,10 @@
30 if (is_executable)
31 xx = rpmfcHelper(fc, 'R', "executable");
ff5da8bf
AF
32 }
33+ if (fc->fcolor->vals[fc->ix] & RPMFC_PHP) {
34+ xx = rpmfcHelper(fc, 'P', "php");
35+ xx = rpmfcHelper(fc, 'R', "php");
36+ }
37
38 return 0;
39 }
986c2b93
JB
40@@ -835,7 +844,7 @@
41 /*@unchecked@*/
42 static struct rpmfcApplyTbl_s rpmfcApplyTable[] = {
ff5da8bf 43 { rpmfcELF, RPMFC_ELF },
986c2b93
JB
44- { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA) },
45+ { rpmfcSCRIPT, (RPMFC_SCRIPT|RPMFC_PERL|RPMFC_PYTHON|RPMFC_LIBTOOL|RPMFC_PKGCONFIG|RPMFC_BOURNE|RPMFC_JAVA|RPMFC_PHP) },
ff5da8bf
AF
46 { NULL, 0 }
47 };
48
986c2b93
JB
49@@ -1027,6 +1036,10 @@
50 else if (slen >= sizeof(".pc") && !strcmp(s+slen-(sizeof(".pc")-1), ".pm"))
51 ftype = "pkgconfig file";
52
df271ccb
JB
53+ /* XXX all files with extension ".php" are PHP modules for now. */
54+ else if (slen >= sizeof(".php") && !strcmp(s+slen-(sizeof(".php")-1), ".php"))
55+ ftype = "PHP script text";
986c2b93 56+
df271ccb
JB
57 /* XXX skip all files in /dev/ which are (or should be) %dev dummies. */
58 else if (slen >= fc->brlen+sizeof("/dev/") && !strncmp(s+fc->brlen, "/dev/", sizeof("/dev/")-1))
59 ftype = "";
ff5da8bf
AF
60--- rpm-4.2/build/rpmfc.h.wiget Tue Apr 1 10:00:23 2003
61+++ rpm-4.2/build/rpmfc.h Tue Apr 1 10:01:22 2003
62@@ -40,6 +40,7 @@
63 StringBuf sb_java; /*!< concatenated list of java colored files. */
64 StringBuf sb_perl; /*!< concatenated list of perl colored files. */
65 StringBuf sb_python;/*!< concatenated list of python colored files. */
66+ StringBuf sb_php; /*!< concatenated list of php colored files. */
67
68 };
69
This page took 0.056112 seconds and 4 git commands to generate.