Accepting request 1207246 from Java:packages

6.3.4 + fix

OBS-URL: https://build.opensuse.org/request/show/1207246
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javapackages-tools?expand=0&rev=46

0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch

@@ -0,0 +1,32 @@
+From 5f1ea127c2465e2a628396c17157834c73d528c7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
+Date: Fri, 11 Oct 2024 15:00:52 +0200
+Subject: [PATCH] Revert "jpackage_script: Remove unneeded backslashes"
+
+This is broken with rpm 4.14.1 for instance
+
+This reverts commit 098485a23336cf7df692631d7bbb90db200d554d.
+---
+ macros.d/macros.jpackage | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage
+index b6c41b48..ceee2a7d 100644
+--- a/macros.d/macros.jpackage
++++ b/macros.d/macros.jpackage
+@@ -35,9 +35,9 @@ cat > %{buildroot}%{_bindir}/%5 << EOF \
+ #\
+ # %{name} script\
+ # JPackage Project <http://www.jpackage.org/>\
+-%{?java_home:
+-# Set default JAVA_HOME
+-JAVA_HOME="\\${JAVA_HOME:-%{java_home}}"
++%{?java_home:\
++# Set default JAVA_HOME\
++JAVA_HOME="\\${JAVA_HOME:-%{java_home}}"\
+ }\
+ # Source functions library\
+ . @{javadir}-utils/java-functions\
+-- 
+2.47.0
+

6.4.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5d9a6ed0e7aa17bc2222cff801a06082d39c4bdc0b9fd1d43c523aed8f6a7d18
-size 192567

javapackages-tools.changes

@@ -1,20 +1,3 @@
--------------------------------------------------------------------
-Mon Jul 28 17:05:19 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
-- Upgrade to upstream version 6.4.1
-  * Changes
-    + Revert "jpackage_script: Remove unneeded backslashes"
-    + Initial implementation of %jp_binding macro
-    + Replace invalid $ escape in regex
-- Removed patch:
-  * 0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch
-    + integrated in this version
-- Modified patches:
-  * python-optional.patch
-  * suse-no-epoch.patch
-  * suse-use-libdir.patch
-    + rediff to changed context
-
 -------------------------------------------------------------------
 Fri Oct 11 10:56:13 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

javapackages-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package javapackages-tools
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@ Name:           javapackages-tools-%{flavor}
 %else
 Name:           javapackages-tools
 %endif
-Version:        6.4.1
+Version:        6.3.4
 Release:        0
 Summary:        Macros and scripts for Java packaging support
 License:        BSD-3-Clause
@@ -45,6 +45,8 @@ Patch1:         python-optional.patch
 #PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora did
 #               Avoid generating unresolvable requires
 Patch2:         suse-no-epoch.patch
+#PATCH-FIX-UPSTREAM: removing the backslashes breaks checks with rpm 4.14.1
+Patch3:         0001-Revert-jpackage_script-Remove-unneeded-backslashes.patch
 
 BuildRequires:  fdupes
 BuildRequires:  perl
@@ -182,7 +184,6 @@ files="
 %{_sysconfdir}/java/eclipse.conf
 %{_datadir}/java-utils/java-functions
 %{_datadir}/java-utils/java-wrapper
-%{_datadir}/java-utils/jp_binding.sh
 %{_datadir}/java-utils/scl-enable
 %{_rpmmacrodir}/macros.jpackage
 %{_rpmmacrodir}/macros.javapackages-filesystem

python-optional.patch

@@ -1,24 +1,18 @@
---- a/build
+Index: javapackages-5.2.0+git20180620.70fa2258/build
-+++ b/build
+===================================================================
-@@ -114,5 +114,3 @@ manpage build-classpath
+--- javapackages-5.2.0+git20180620.70fa2258.orig/build
++++ javapackages-5.2.0+git20180620.70fa2258/build
+@@ -117,5 +117,3 @@ manpage build-classpath
  manpage build-jar-repository
  manpage rebuild-jar-repository
  manpage shade-jar
 -
 -(cd ./python && "${pyinterpreter}" setup.py build)
---- a/configure
+Index: javapackages-5.2.0+git20180620.70fa2258/install
-+++ b/configure
+===================================================================
-@@ -85,7 +85,6 @@ test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
+--- javapackages-5.2.0+git20180620.70fa2258.orig/install
- test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
++++ javapackages-5.2.0+git20180620.70fa2258/install
- 
+@@ -253,8 +253,3 @@ exec >files-gradle
- test -z "${m2home}" && m2home="${datadir}/xmvn"
--test -z "${pyinterpreter}" && pyinterpreter=$(type -p python)
- test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector"
- 
- eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.javapackages-filesystem)
---- a/install
-+++ b/install
-@@ -237,8 +237,3 @@ exec >files-gradle
  inst_exec target/gradle-local "${bindir}"
  inst_data gradle/init.gradle "${datadir}/gradle-local"
  inst_data target/gradle_build.7 "${mandir}/man7"
@@ -27,3 +21,15 @@
 -(cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2
 -echo "${prefix}/lib/python*/site-packages/javapackages"
 -echo "${prefix}/lib/python*/site-packages/javapackages-*.egg-info"
+Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh
+===================================================================
+--- javapackages-5.2.0+git20180620.70fa2258.orig/configure
++++ javapackages-5.2.0+git20180620.70fa2258/configure
+@@ -57,7 +57,6 @@ test -z "${rpmconfigdir}" && rpmconfigdi
+ test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
+ 
+ test -z "${m2home}" && m2home="${datadir}/xmvn"
+-test -z "${pyinterpreter}" && pyinterpreter=$(type -p python)
+ test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector"
+ 
+ eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.javapackages-filesystem)

suse-no-epoch.patch

@@ -1,6 +1,6 @@
---- a/depgenerators/maven.req
+--- javapackages-5.3.0/depgenerators/maven.req	2018-08-06 17:09:06.000000000 +0200
-+++ b/depgenerators/maven.req
++++ javapackages-5.3.0/depgenerators/maven.req	2018-10-24 10:29:11.404375107 +0200
-@@ -294,9 +294,9 @@ class TagBuilder(object):
+@@ -295,9 +295,9 @@
      def _get_java_requires(self, reqs):
          major, minor = max([self._parse_java_requires(x) for x in reqs])
          if minor:
@@ -12,9 +12,9 @@
  
      def _parse_java_requires(self, req):
          match = re.match(r'^(\d+)(?:\.(\d+))?$', req)
---- a/test/maven_req_test.py
+--- javapackages-5.3.0/test/maven_req_test.py	2018-08-06 17:09:06.000000000 +0200
-+++ b/test/maven_req_test.py
++++ javapackages-5.3.0/test/maven_req_test.py	2018-10-24 10:28:59.408310751 +0200
-@@ -30,7 +30,7 @@ class TestMavenReq(unittest.TestCase):
+@@ -30,7 +30,7 @@
          self.assertEqual(return_value, 0, stderr)
          sout = [x for x in stdout.split('\n') if x]
          want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)",
@@ -23,7 +23,7 @@
          self.assertEqual(set(want), set(sout))
  
      @mavenreq(["require-java2/buildroot/usr/share/maven-metadata/require.xml"])
-@@ -38,7 +38,7 @@ class TestMavenReq(unittest.TestCase):
+@@ -38,7 +38,7 @@
          self.assertEqual(return_value, 0, stderr)
          sout = [x for x in stdout.split('\n') if x]
          want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)",
@@ -32,7 +32,7 @@
          self.assertEqual(set(want), set(sout))
  
      @mavenreq(["require-java3/buildroot/usr/share/maven-metadata/require.xml"])
-@@ -46,7 +46,7 @@ class TestMavenReq(unittest.TestCase):
+@@ -46,7 +46,7 @@
          self.assertEqual(return_value, 0, stderr)
          sout = [x for x in stdout.split('\n') if x]
          want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)",
@@ -41,7 +41,7 @@
          self.assertEqual(set(want), set(sout))
  
      @mavenreq(["require-java9/buildroot/usr/share/maven-metadata/require.xml"])
-@@ -54,7 +54,7 @@ class TestMavenReq(unittest.TestCase):
+@@ -54,7 +54,7 @@
          self.assertEqual(return_value, 0, stderr)
          sout = [x for x in stdout.split('\n') if x]
          want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)",
@@ -50,7 +50,7 @@
          self.assertEqual(set(want), set(sout))
  
      @mavenreq(["require-java10/buildroot/usr/share/maven-metadata/require.xml"])
-@@ -62,7 +62,7 @@ class TestMavenReq(unittest.TestCase):
+@@ -62,7 +62,7 @@
          self.assertEqual(return_value, 0, stderr)
          sout = [x for x in stdout.split('\n') if x]
          want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)",
@@ -59,7 +59,7 @@
          self.assertEqual(set(want), set(sout))
  
      @mavenreq(["require-java9and10/buildroot/usr/share/maven-metadata/require.xml"])
-@@ -70,7 +70,7 @@ class TestMavenReq(unittest.TestCase):
+@@ -70,7 +70,7 @@
          self.assertEqual(return_value, 0, stderr)
          sout = [x for x in stdout.split('\n') if x]
          want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)",

suse-use-libdir.patch

@@ -1,6 +1,6 @@
---- a/configure
+--- javapackages-5.3.1/configure	2019-06-14 12:26:27.000000000 +0200
-+++ b/configure
++++ javapackages-5.3.1/configure	2020-07-16 09:04:37.316453132 +0200
-@@ -43,6 +43,7 @@ sysconfdir
+@@ -14,6 +14,7 @@
  root_sysconfdir
  rpmconfigdir
  rpmmacrodir
@@ -8,7 +8,7 @@
  
  m2home
  
-@@ -81,6 +82,7 @@ test -z "${mandir}" && mandir="${datadir}/man"
+@@ -51,6 +52,7 @@
  test -z "${rundir}" && rundir="${localstatedir}/run"
  test -z "${sysconfdir}" && sysconfdir="${prefix}/etc"
  test -z "${root_sysconfdir}" && root_sysconfdir="${prefix}/etc"
@@ -16,8 +16,9 @@
  test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm"
  test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d"
  
---- a/etc/eclipse.conf
+diff -urEbwB javapackages-5.3.1/etc/eclipse.conf javapackages-5.3.1/etc/eclipse.conf
-+++ b/etc/eclipse.conf
+--- javapackages-5.3.1/etc/eclipse.conf	2019-06-14 12:26:27.000000000 +0200
++++ javapackages-5.3.1/etc/eclipse.conf	2020-07-16 09:04:37.316453132 +0200
 @@ -1,7 +1,7 @@
  # Eclipse filesystem configuration file
  
@@ -27,7 +28,7 @@
  
  # Location of architecture-independant dropins
  eclipse.dropins.noarch=@{datadir}/eclipse/dropins
-@@ -10,10 +10,10 @@ eclipse.dropins.noarch=@{datadir}/eclipse/dropins
+@@ -10,10 +10,10 @@
  eclipse.droplets.noarch=@{datadir}/eclipse/droplets
  
  # Location of architecture-dependant dropins
@@ -40,9 +41,9 @@
  
  # Comma-separated list of directories searched for external bundles
  eclipse.bundles=@{javadir},@{jnidir}
---- a/expand.sh
+--- javapackages-5.3.1/expand.sh	2019-06-14 12:26:27.000000000 +0200
-+++ b/expand.sh
++++ javapackages-5.3.1/expand.sh	2020-07-16 09:04:37.316453132 +0200
-@@ -41,6 +41,7 @@ expand()
+@@ -45,6 +45,7 @@
      sed \
          -e "s|@{bindir}|${bindir}|g" \
          -e "s|@{datadir}|${datadir}|g" \
@@ -50,11 +51,11 @@
          -e "s|@{javaconfdir}|${javaconfdir}|g" \
          -e "s|@{javadir}|${javadir}|g" \
          -e "s|@{jnidir}|${jnidir}|g" \
---- a/install
+--- javapackages-5.3.1/install	2019-06-14 12:26:27.000000000 +0200
-+++ b/install
++++ javapackages-5.3.1/install	2020-07-16 09:04:37.316453132 +0200
-@@ -91,11 +91,11 @@ dir "${mavenpomdir}"
+@@ -90,11 +90,11 @@
+ dir "${mavenpomdir}"
  dir "${ivyxmldir}"
- dir "${jpbindingdir}"
  dir "${datadir}/maven-metadata"
 -dir "${prefix}/lib/eclipse"
 -dir "${prefix}/lib/eclipse/features"
@@ -69,8 +70,8 @@
  dir "${datadir}/eclipse"
  dir "${datadir}/eclipse/dropins"
  dir "${datadir}/eclipse/droplets"
---- a/macros.d/macros.javapackages-filesystem
+--- javapackages-5.3.1/macros.d/macros.javapackages-filesystem	2019-06-14 12:26:27.000000000 +0200
-+++ b/macros.d/macros.javapackages-filesystem
++++ javapackages-5.3.1/macros.d/macros.javapackages-filesystem	2020-07-16 09:05:34.448792440 +0200
 @@ -13,17 +13,17 @@
  #
  # Root directory where all Java VMs/SDK/JREs are installed.