- updated javadeps patch, removed namespaceccompare (code differs to much)

[packages/rpm.git] / rpm-javadeps.patch

diff --git a/rpm-javadeps.patch b/rpm-javadeps.patch
index 82a1fc868ae130c56641fd1a9e9c8d9e3bdb14d6..8ae3ef846fad903f332c56ac752c7d065cfaf50c 100644 (file)
--- a/rpm-javadeps.patch
+++ b/rpm-javadeps.patch
@@ -1,28 +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
-@@ -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);
-+    } 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);
-     }
+--- 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
  
-     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
+ 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      %{nil}
- 
- #------------------------------------------------------------------------
- # libtool(...) configuration.
++%__java_requires      env RPM_BUILD_ROOT=%{buildroot} MIN_CLASSDATAVERSION=%{?java_min_classdataversion} %{_rpmhome}/java-find-requires
++%__java_magic         ^PHP script.*
++%__java_path          \\.php$
++%__java_flags         magic_and_path