From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Tue, 22 May 2007 20:15:09 +0000 (+0000)
Subject: - ported to 4.4.9
X-Git-Tag: auto/th/rpm-4_4_9-0_1~10
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=2f6105629dbb5f5197bd38eda13b6cd72f2041cd

- ported to 4.4.9

Changed files:
    rpm-javadeps.patch -> 1.2
---

diff --git a/rpm-javadeps.patch b/rpm-javadeps.patch
new file mode 100644
index 0000000..38a7d5f
--- /dev/null
+++ b/rpm-javadeps.patch
@@ -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.