SOURCES: rpm-javadeps.patch - updated

[arekm]

Author: arekm                        Date: Tue Oct  2 13:44:06 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   rpm-javadeps.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/rpm-javadeps.patch
diff -u SOURCES/rpm-javadeps.patch:1.4 SOURCES/rpm-javadeps.patch:1.5
--- SOURCES/rpm-javadeps.patch:1.4	Thu May 24 21:27:24 2007
+++ SOURCES/rpm-javadeps.patch	Tue Oct  2 15:44:01 2007
@@ -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,16 +11,18 @@
 +	if (fc->findreq)
 +	    xx = rpmfcHelper(fc, 'R', "java", fc->noautoreq, fc->noautoreq_c);
      }
- 
++
      return 0;
+ }
+ 
 --- 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 %{_usrlibrpm}/rpmdeps {--provides|--requires}.
--%__java_provides	%{_usrlibrpm}/javadeps.sh --provides
--%__java_requires	%{_usrlibrpm}/javadeps.sh --requires
+ # 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}
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm-javadeps.patch?r1=1.4&r2=1.5&f=u