X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=rpm-javadeps.patch;h=9a88b4939713d791e969a87a5d464c58b17426ed;hb=5b9fce5b6357f97edead710813667e3f1a3a0dda;hp=82a1fc868ae130c56641fd1a9e9c8d9e3bdb14d6;hpb=f8cb98bab991534c1f8b8e61b8e05bdd55380dfd;p=packages%2Frpm.git

diff --git a/rpm-javadeps.patch b/rpm-javadeps.patch
index 82a1fc8..9a88b49 100644
--- a/rpm-javadeps.patch
+++ b/rpm-javadeps.patch
@@ -1,28 +1,26 @@
 --- 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,6 +875,10 @@
+ 	xx = rpmfcHelper(fc, 'P', "gstreamer");
+ 	/* XXX: currently of no use, but for the sake of consistency... */
+ 	xx = rpmfcHelper(fc, 'R', "gstreamer");
 +    } 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);
++	xx = rpmfcHelper(fc, 'P', "java");
++	xx = rpmfcHelper(fc, 'R', "java");
      }
  
-     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
+ /*@-observertrans@*/
+--- rpm-4.4.9/macros/java.in.orig	2007-05-24 21:20:49.657284000 +0200
++++ rpm-4.4.9/macros/java.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}
++%__java_requires	env RPM_BUILD_ROOT=%{buildroot} %{_rpmhome}/java-find-requires
  
- #------------------------------------------------------------------------
- # libtool(...) configuration.
+ #	The value of CLASSPATH in build scriptlets (iff configured).
+ #