X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-javadeps.patch;h=833db5db8ccbf0513983a6dc270ffab362083f42;hb=63ea47af96cacd4a52787c03ea344cc358b474cc;hp=38a7d5f28e77c4cc87434f15388f2a3de061f4a4;hpb=2f6105629dbb5f5197bd38eda13b6cd72f2041cd;p=packages%2Frpm.git

diff --git a/rpm-javadeps.patch b/rpm-javadeps.patch
index 38a7d5f..833db5d 100644
--- a/rpm-javadeps.patch
+++ b/rpm-javadeps.patch
@@ -1,9 +1,9 @@
 --- 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);
+@@ -875,7 +875,14 @@
+ 	if (is_executable)
+ 	    if (fc->findreq)
+ 	    xx = rpmfcHelper(fc, 'R', "mono", fc->noautoreq, fc->noautoreq_c);
 +    } else
 +    if (fc->fcolor->vals[fc->ix] & RPMFC_JAVA) {
 +	if (fc->findprov)
@@ -11,17 +11,20 @@
 +	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
+ }
  
+--- rpm-4.4.9/macros.in.orig	2007-05-24 21:20:49.657284000 +0200
++++ rpm-4.4.9/macros.in	2007-05-24 21:22:32.823163996 +0200
+@@ -1416,8 +1416,8 @@
+ #
+ # Note: Used iff _use_internal_dependency_generator is non-zero. The
+ # helpers are also used by %{_rpmhome}/rpmdeps {--provides|--requires}.
+-%__java_provides	%{_rpmhome}/javadeps.sh --provides
+-%__java_requires	%{_rpmhome}/javadeps.sh --requires
 +%__java_provides	%{nil}
 +%__java_requires	%{nil}
-+
- #
- # Path to selinux file context patterns used to verify
- # file contexts on file system.
+ 
+ #------------------------------------------------------------------------
+ # libtool(...) configuration.