[packages/rpm] updated javadeps patch to 5.4

[baggins]

commit 775829ebdddf67c38c21710815c1c150cf233512
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Aug 25 19:18:49 2012 +0200

    updated javadeps patch to 5.4

 rpm-javadeps.patch | 26 +++++++++++---------------
 rpm.spec           |  3 +--
 2 files changed, 12 insertions(+), 17 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index 148d5fe..10064bd 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -719,8 +719,7 @@ install %{SOURCE12} scripts/perl.prov
 %patch41 -p1
 %patch42 -p1
 %patch46 -p1
-# port to new implementation
-#%patch47 -p1
+%patch47 -p1
 %patch55 -p1
 %patch59 -p1
 %patch17 -p1
diff --git a/rpm-javadeps.patch b/rpm-javadeps.patch
index 833db5d..7b7524b 100644
--- a/rpm-javadeps.patch
+++ b/rpm-javadeps.patch
@@ -1,22 +1,18 @@
 --- 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
-@@ -875,7 +875,14 @@
- 	if (is_executable)
- 	    if (fc->findreq)
- 	    xx = rpmfcHelper(fc, 'R', "mono", 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
@@ -26,5 +22,5 @@
 +%__java_provides	%{nil}
 +%__java_requires	%{nil}
  
- #------------------------------------------------------------------------
- # libtool(...) configuration.
+ #	The value of CLASSPATH in build scriptlets (iff configured).
+ #