]> git.pld-linux.org Git - packages/rpm.git/commitdiff
- ported to 4.4.9
authorJakub Bogusz <qboosh@pld-linux.org>
Tue, 22 May 2007 20:15:09 +0000 (20:15 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    rpm-javadeps.patch -> 1.2

rpm-javadeps.patch [new file with mode: 0644]

diff --git a/rpm-javadeps.patch b/rpm-javadeps.patch
new file mode 100644 (file)
index 0000000..38a7d5f
--- /dev/null
@@ -0,0 +1,27 @@
+--- rpm-4.4.9/lib/rpmfc.c.orig 2007-05-22 20:19:05.990914000 +0200
++++ rpm-4.4.9/lib/rpmfc.c      2007-05-22 22:12:38.775152636 +0200
+@@ -866,6 +866,12 @@
+       /* not only executable, files run by httpd usually are not */
+       if (fc->findreq)
+           xx = rpmfcHelper(fc, 'R', "php", fc->noautoreq, fc->noautoreq_c);
++    } else
++    if (fc->fcolor->vals[fc->ix] & RPMFC_JAVA) {
++      if (fc->findprov)
++          xx = rpmfcHelper(fc, 'P', "java", fc->noautoprov, fc->noautoprov_c);
++      if (fc->findreq)
++          xx = rpmfcHelper(fc, 'R', "java", fc->noautoreq, fc->noautoreq_c);
+     }
+     return 0;
+--- rpm-4.4.9/macros.in.orig   2007-05-22 20:22:01.924940000 +0200
++++ rpm-4.4.9/macros.in        2007-05-22 22:13:06.612739010 +0200
+@@ -444,6 +444,9 @@
+ %__mono_provides      @RPMCONFIGDIR@/monodeps.sh --provides
+ %__mono_requires      @RPMCONFIGDIR@/monodeps.sh --requires
++%__java_provides      %{nil}
++%__java_requires      %{nil}
++
+ #
+ # Path to selinux file context patterns used to verify
+ # file contexts on file system.
This page took 0.090882 seconds and 4 git commands to generate.