X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=blobdiff_plain;f=rpm-javadeps.patch;h=8ae3ef846fad903f332c56ac752c7d065cfaf50c;hp=3e8303c7efd2ee70fda057cc0780f80a35444ef7;hb=58639ed6a0563b2f93ab436bbe31aec535bcc89d;hpb=34865f27901a6b75d0e12d61fd5609b9a403ab84

diff --git a/rpm-javadeps.patch b/rpm-javadeps.patch
index 3e8303c..8ae3ef8 100644
--- a/rpm-javadeps.patch
+++ b/rpm-javadeps.patch
@@ -1,26 +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,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) {
-+	xx = rpmfcHelper(fc, 'P', "java");
-+	xx = rpmfcHelper(fc, 'R', "java");
-     }
+--- rpm-4.15.1/fileattrs/Makefile.am~	2019-06-26 23:17:31.000000000 +0900
++++ rpm-4.15.1/fileattrs/Makefile.am	2019-12-29 00:23:02.120085588 +0900
+@@ -8,6 +8,6 @@
+ fattrs_DATA = \
+ 	debuginfo.attr desktop.attr elf.attr font.attr libtool.attr metainfo.attr \
+ 	perl.attr perllib.attr pkgconfig.attr python.attr pythondist.attr ocaml.attr \
+-	script.attr php.attr
++	script.attr php.attr java.attr
  
- /*@-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 %{_rpmhome}/rpmdeps {--provides|--requires}.
--%__java_provides	%{_rpmhome}/javadeps.sh --provides
--%__java_requires	%{_rpmhome}/javadeps.sh --requires
+ EXTRA_DIST = $(fattrs_DATA)
+--- /dev/null	2019-12-23 19:28:16.334291624 +0900
++++ rpm-4.15.1/fileattrs/java.attr	2019-12-29 00:22:52.989864428 +0900
+@@ -0,0 +1,5 @@
 +%__java_provides	%{nil}
 +%__java_requires	env RPM_BUILD_ROOT=%{buildroot} MIN_CLASSDATAVERSION=%{?java_min_classdataversion} %{_rpmhome}/java-find-requires
- 
- #	The value of CLASSPATH in build scriptlets (iff configured).
- #	
++%__java_magic		^PHP script.*
++%__java_path		\\.php$
++%__java_flags		magic_and_path