From 5cf011d632d5dd205094b7a880b926a2778ed68b2434d69dbcd996da237ac1ab Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 24 Oct 2018 08:03:19 +0000 Subject: [PATCH 1/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=48 --- javapackages-tools.changes | 8 ++++++++ javapackages-tools.spec | 5 ++++- suse-no-epoch.patch | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 suse-no-epoch.patch diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 7f8346d..062cabb 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Oct 24 07:53:45 UTC 2018 - Fridrich Strba + +- Added patch: + * suse-no-epoch.patch + + we did not bump epoch of openjdk packages in SUSE + + fix a potential generation of unresolvable requires + ------------------------------------------------------------------- Tue Jul 24 14:09:47 UTC 2018 - tchvatal@suse.com diff --git a/javapackages-tools.spec b/javapackages-tools.spec index f3272db..e695f42 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -40,6 +40,9 @@ Source: javapackages-%{version}.tar.xz Patch0: suse-use-libdir.patch #PATCH-FIX-SUSE: allow building without python to reduce depgraph 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 BuildRequires: asciidoc BuildRequires: fdupes BuildRequires: rpm diff --git a/suse-no-epoch.patch b/suse-no-epoch.patch new file mode 100644 index 0000000..bcf037e --- /dev/null +++ b/suse-no-epoch.patch @@ -0,0 +1,11 @@ +--- javapackages-5.2.0+git20180620.70fa2258/depgenerators/maven.req 2018-06-20 12:13:47.000000000 +0200 ++++ javapackages-5.2.0+git20180620.70fa2258/depgenerators/maven.req 2018-10-24 09:57:35.322176828 +0200 +@@ -311,7 +311,7 @@ + version = version_string.split('.') + major = int(version[0]) + minor = int(version[1]) +- return "1:{0}.{1}".format(major, minor) ++ return "{0}.{1}".format(major, minor) + + def _filter_requires(self, requires): + filters = self.config.get('requires_filter', []) From c40b272e798adcb94a099a6230bf068ac20b6c31fecb591128140059cc10d9ef Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 24 Oct 2018 08:21:02 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=49 --- 5.3.0.tar.gz | 3 +++ ...packages-5.2.0+git20180620.70fa2258.tar.xz | 3 --- javapackages-tools.changes | 10 +++++++- javapackages-tools.spec | 6 ++--- suse-no-epoch.patch | 23 +++++++++++-------- 5 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 5.3.0.tar.gz delete mode 100644 javapackages-5.2.0+git20180620.70fa2258.tar.xz diff --git a/5.3.0.tar.gz b/5.3.0.tar.gz new file mode 100644 index 0000000..3833f95 --- /dev/null +++ b/5.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73803877c26b3e6c0440b2e1e4d78a5fadf63782a62374df400b8badb1de3046 +size 155460 diff --git a/javapackages-5.2.0+git20180620.70fa2258.tar.xz b/javapackages-5.2.0+git20180620.70fa2258.tar.xz deleted file mode 100644 index 175158a..0000000 --- a/javapackages-5.2.0+git20180620.70fa2258.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb6483258ffcae21358c77e7db34ff179d67f05d64e26226aed290f302fc6e82 -size 116692 diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 062cabb..c2709cc 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,9 +1,17 @@ +------------------------------------------------------------------- +Wed Oct 24 08:19:24 UTC 2018 - Fridrich Strba + +- Update to version 5.3.0 +- Modified patch: + * suse-no-epoch.patch + + rediff to changed code + ------------------------------------------------------------------- Wed Oct 24 07:53:45 UTC 2018 - Fridrich Strba - Added patch: * suse-no-epoch.patch - + we did not bump epoch of openjdk packages in SUSE + + we did not bump epoch of OpenJDK packages in SUSE + fix a potential generation of unresolvable requires ------------------------------------------------------------------- diff --git a/javapackages-tools.spec b/javapackages-tools.spec index e695f42..8d8d82b 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -27,14 +27,15 @@ Name: javapackages-tools-%{flavor} %else Name: javapackages-tools %endif -Version: 5.2.0+git20180620.70fa2258 +Version: 5.3.0 Release: 0 Summary: Macros and scripts for Java packaging support License: BSD-3-Clause Group: Development/Languages/Java URL: https://github.com/fedora-java/javapackages # Latest tag is missing, quite often needs patches, use service -Source: javapackages-%{version}.tar.xz +Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz + #PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64 on 64bits # where Fedora use jpackage convention - usr/lib everywhere Patch0: suse-use-libdir.patch @@ -47,7 +48,6 @@ BuildRequires: asciidoc BuildRequires: fdupes BuildRequires: rpm BuildRequires: xmlto -BuildRequires: xz # Used on too many places Provides: jpackage-utils = %{version} Obsoletes: %{name}-doc diff --git a/suse-no-epoch.patch b/suse-no-epoch.patch index bcf037e..95585c4 100644 --- a/suse-no-epoch.patch +++ b/suse-no-epoch.patch @@ -1,11 +1,14 @@ ---- javapackages-5.2.0+git20180620.70fa2258/depgenerators/maven.req 2018-06-20 12:13:47.000000000 +0200 -+++ javapackages-5.2.0+git20180620.70fa2258/depgenerators/maven.req 2018-10-24 09:57:35.322176828 +0200 -@@ -311,7 +311,7 @@ - version = version_string.split('.') - major = int(version[0]) - minor = int(version[1]) -- return "1:{0}.{1}".format(major, minor) -+ return "{0}.{1}".format(major, minor) +--- javapackages-5.3.0/depgenerators/maven.req 2018-08-06 17:09:06.000000000 +0200 ++++ javapackages-5.3.0/depgenerators/maven.req 2018-10-24 09:50:40.415911553 +0200 +@@ -295,9 +295,9 @@ + def _get_java_requires(self, reqs): + major, minor = max([self._parse_java_requires(x) for x in reqs]) + if minor: +- return "1:{0}.{1}".format(major, minor) ++ return "{0}.{1}".format(major, minor) + else: +- return "1:{0}".format(major) ++ return "{0}".format(major) - def _filter_requires(self, requires): - filters = self.config.get('requires_filter', []) + def _parse_java_requires(self, req): + match = re.match(r'^(\d+)(?:\.(\d+))?$', req) From 3618a18e7b326e2c53bb4a34d8dd45f015bc1e820b120fbf68af91a901c52329 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 24 Oct 2018 08:31:07 +0000 Subject: [PATCH 3/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=50 --- suse-no-epoch.patch | 58 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/suse-no-epoch.patch b/suse-no-epoch.patch index 95585c4..0b08bd4 100644 --- a/suse-no-epoch.patch +++ b/suse-no-epoch.patch @@ -1,5 +1,5 @@ --- javapackages-5.3.0/depgenerators/maven.req 2018-08-06 17:09:06.000000000 +0200 -+++ javapackages-5.3.0/depgenerators/maven.req 2018-10-24 09:50:40.415911553 +0200 ++++ javapackages-5.3.0/depgenerators/maven.req 2018-10-24 10:29:11.404375107 +0200 @@ -295,9 +295,9 @@ def _get_java_requires(self, reqs): major, minor = max([self._parse_java_requires(x) for x in reqs]) @@ -12,3 +12,59 @@ def _parse_java_requires(self, req): match = re.match(r'^(\d+)(?:\.(\d+))?$', req) +--- javapackages-5.3.0/test/maven_req_test.py 2018-08-06 17:09:06.000000000 +0200 ++++ javapackages-5.3.0/test/maven_req_test.py 2018-10-24 10:28:59.408310751 +0200 +@@ -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)", +- "java-headless >= 1:1.6") ++ "java-headless >= 1.6") + self.assertEqual(set(want), set(sout)) + + @mavenreq(["require-java2/buildroot/usr/share/maven-metadata/require.xml"]) +@@ -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)", +- "java-headless >= 1:1.8") ++ "java-headless >= 1.8") + self.assertEqual(set(want), set(sout)) + + @mavenreq(["require-java3/buildroot/usr/share/maven-metadata/require.xml"]) +@@ -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)", +- "java-headless >= 1:1.8") ++ "java-headless >= 1.8") + self.assertEqual(set(want), set(sout)) + + @mavenreq(["require-java9/buildroot/usr/share/maven-metadata/require.xml"]) +@@ -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)", +- "java-headless >= 1:9") ++ "java-headless >= 9") + self.assertEqual(set(want), set(sout)) + + @mavenreq(["require-java10/buildroot/usr/share/maven-metadata/require.xml"]) +@@ -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)", +- "java-headless >= 1:10") ++ "java-headless >= 10") + self.assertEqual(set(want), set(sout)) + + @mavenreq(["require-java9and10/buildroot/usr/share/maven-metadata/require.xml"]) +@@ -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)", +- "java-headless >= 1:10") ++ "java-headless >= 10") + self.assertEqual(set(want), set(sout)) + + @mavenreq(["require-java-fail/buildroot/usr/share/maven-metadata/require.xml"]) From 29dc24c59edf5da3ef79196fa0998260a3530db9806901ebfb3aee0ecfa12c73 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 24 Oct 2018 09:11:13 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=51 --- javapackages-tools.changes | 2 ++ javapackages-tools.spec | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/javapackages-tools.changes b/javapackages-tools.changes index c2709cc..660ae59 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -5,6 +5,7 @@ Wed Oct 24 08:19:24 UTC 2018 - Fridrich Strba - Modified patch: * suse-no-epoch.patch + rediff to changed code +- Build the :extras flavour as noarch ------------------------------------------------------------------- Wed Oct 24 07:53:45 UTC 2018 - Fridrich Strba @@ -13,6 +14,7 @@ Wed Oct 24 07:53:45 UTC 2018 - Fridrich Strba * suse-no-epoch.patch + we did not bump epoch of OpenJDK packages in SUSE + fix a potential generation of unresolvable requires + + adapt the tests to not expect the epoch ------------------------------------------------------------------- Tue Jul 24 14:09:47 UTC 2018 - tchvatal@suse.com diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 8d8d82b..330cb81 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -33,9 +33,7 @@ Summary: Macros and scripts for Java packaging support License: BSD-3-Clause Group: Development/Languages/Java URL: https://github.com/fedora-java/javapackages -# Latest tag is missing, quite often needs patches, use service Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz - #PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64 on 64bits # where Fedora use jpackage convention - usr/lib everywhere Patch0: suse-use-libdir.patch @@ -48,6 +46,7 @@ BuildRequires: asciidoc BuildRequires: fdupes BuildRequires: rpm BuildRequires: xmlto +Requires: javapackages-filesystem = %{version}-%{release} # Used on too many places Provides: jpackage-utils = %{version} Obsoletes: %{name}-doc @@ -57,11 +56,20 @@ BuildRequires: python3-lxml BuildRequires: python3-nose BuildRequires: python3-setuptools BuildRequires: python3-six +BuildArch: noarch %endif %description This package provides macros and scripts to support Java packaging. +%package -n javapackages-filesystem +Summary: Java packages filesystem layout +Group: Development/Languages/Java + +%description -n javapackages-filesystem +This package provides some basic directories into which Java packages +install their content. + %if %{with python} %package -n maven-local Summary: Macros and scripts for Maven packaging support @@ -172,9 +180,6 @@ files=" for i in $files; do rm -rf %{buildroot}/$i done -%else -# we want this in the basic package always -cat files-filesystem >> files-tools %endif rm -rf %{buildroot}%{_datadir}/fedora-review/ @@ -187,7 +192,9 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/ %if !%{with python} %files -f files-tools %license LICENSE -%dir %{_datadir}/maven-metadata + +%files -n javapackages-filesystem -f files-filesystem + %else %files -n javapackages-local -f files-local %dir %{_datadir}/java-utils From 056c80113b40e3245f79d9c93b9766fa9e25b2a58aa5b459d0962b1bf504acd4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 5 Nov 2018 09:35:48 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=52 --- javapackages-tools.changes | 6 ++++++ javapackages-tools.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 660ae59..837ad6f 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 5 09:34:51 UTC 2018 - Fridrich Strba + +- Replace the occurences of /usr/lib by libdir in configuration + files too + ------------------------------------------------------------------- Wed Oct 24 08:19:24 UTC 2018 - Fridrich Strba diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 330cb81..9d2638c 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -44,6 +44,7 @@ Patch1: python-optional.patch Patch2: suse-no-epoch.patch BuildRequires: asciidoc BuildRequires: fdupes +BuildRequires: perl BuildRequires: rpm BuildRequires: xmlto Requires: javapackages-filesystem = %{version}-%{release} @@ -125,6 +126,9 @@ This package provides non-essential macros and scripts to support Java packaging %prep %setup -q -n javapackages-%{version} %autopatch -p1 +# The usr/lib is hardcoded in configuration files too +new_dir=$(echo %{_libdir} | sed 's#/##') +perl -pi -e "s#usr/lib#${new_dir}#g" configs/*.xml %build %configure \ From 5e87d40bce578b8d36140213da94fc2a9a516abcd04a4cc6d47b6868c5612b3a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 5 Nov 2018 09:59:44 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=53 --- javapackages-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 9d2638c..0beec01 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -126,6 +126,7 @@ This package provides non-essential macros and scripts to support Java packaging %prep %setup -q -n javapackages-%{version} %autopatch -p1 + # The usr/lib is hardcoded in configuration files too new_dir=$(echo %{_libdir} | sed 's#/##') perl -pi -e "s#usr/lib#${new_dir}#g" configs/*.xml