From 72ad87aaebbda6d009f5a1902668198b312a4b1f Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 6 Aug 2018 17:24:43 +0200 Subject: [PATCH] Update to upstream version 5.3.0 --- .gitignore | 1 + 0001-Fix-traceback-on-corrupt-zipfile.patch | 35 --- ...-kwarg-in-call_script-to-wait-revers.patch | 89 ------ ...Backport-abrt-java-connector-changes.patch | 70 ----- ...ires-generator-to-javapackages-files.patch | 273 ------------------ javapackages-tools.spec | 12 +- sources | 2 +- 7 files changed, 7 insertions(+), 475 deletions(-) delete mode 100644 0001-Fix-traceback-on-corrupt-zipfile.patch delete mode 100644 0001-Rename-the-async-kwarg-in-call_script-to-wait-revers.patch delete mode 100644 0002-Backport-abrt-java-connector-changes.patch delete mode 100644 0002-Switch-auto-requires-generator-to-javapackages-files.patch diff --git a/.gitignore b/.gitignore index 27c0251..cce35e8 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ /5.0.0.tar.gz /5.1.0.tar.gz /5.2.0.tar.gz +/5.3.0.tar.gz diff --git a/0001-Fix-traceback-on-corrupt-zipfile.patch b/0001-Fix-traceback-on-corrupt-zipfile.patch deleted file mode 100644 index 0c99cc5..0000000 --- a/0001-Fix-traceback-on-corrupt-zipfile.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 80e8bf4344417f55510bc6f8ee29af7014b024ca Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Wed, 16 Aug 2017 15:20:29 +0200 -Subject: [PATCH 1/2] Fix traceback on corrupt zipfile - -Resolves: rhbz#1481005 ---- - python/javapackages/common/manifest.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/python/javapackages/common/manifest.py b/python/javapackages/common/manifest.py -index 9a27ff8..5a6245b 100644 ---- a/python/javapackages/common/manifest.py -+++ b/python/javapackages/common/manifest.py -@@ -33,7 +33,7 @@ - # Michal Srb - - import zipfile --from zipfile import ZipFile -+from zipfile import ZipFile, BadZipfile - from javapackages.common.exception import JavaPackagesToolsException - - -@@ -61,7 +61,7 @@ class Manifest(object): - jarfile = ZipFile(self._path) - if "META-INF/MANIFEST.MF" in jarfile.namelist(): - mf = jarfile.open("META-INF/MANIFEST.MF", "r") -- except IOError: -+ except (IOError, BadZipfile): - pass - if mf is None: - return None --- -2.17.0 - diff --git a/0001-Rename-the-async-kwarg-in-call_script-to-wait-revers.patch b/0001-Rename-the-async-kwarg-in-call_script-to-wait-revers.patch deleted file mode 100644 index a81edba..0000000 --- a/0001-Rename-the-async-kwarg-in-call_script-to-wait-revers.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 000eaa96943b0f4634a10a7232355ce59c9efccb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Wed, 20 Jun 2018 11:35:03 +0200 -Subject: [PATCH 1/2] Rename the async kwarg in call_script to wait (reverses - the logic) - -async is a reserved keyword in Python 3.7 and keeping it results -in syntax error. I didn't want to rename the argument to asynch or -async_ without thinking, so I've checked what it does and went with -wait. I reversed the logic because I didn't want it to be nowait. ---- - test/pm_request_test.py | 10 +++++----- - test/test_common.py | 4 ++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/test/pm_request_test.py b/test/pm_request_test.py -index 92ccbaa..256ab56 100644 ---- a/test/pm_request_test.py -+++ b/test/pm_request_test.py -@@ -19,7 +19,7 @@ class PmRequestTest(unittest.TestCase): - def test_ok(self): - (out, err, proc) = call_script(self.scriptpath, - ['maven', 'junit:junit'], -- extra_env=self.env, async=True) -+ extra_env=self.env, wait=False) - conn, _ = self.sock.accept() - request = conn.makefile().readline().rstrip() - self.assertEqual(request, "install 'mvn(junit:junit)'") -@@ -31,7 +31,7 @@ class PmRequestTest(unittest.TestCase): - def test_nok(self): - (out, err, proc) = call_script(self.scriptpath, - ['maven', 'junit:junit'], -- extra_env=self.env, async=True) -+ extra_env=self.env, wait=False) - conn, _ = self.sock.accept() - request = conn.makefile().readline().rstrip() - self.assertEqual(request, "install 'mvn(junit:junit)'") -@@ -43,7 +43,7 @@ class PmRequestTest(unittest.TestCase): - def test_jar(self): - (out, err, proc) = call_script(self.scriptpath, - ['maven', 'gid:aid:jar::'], -- extra_env=self.env, async=True) -+ extra_env=self.env, wait=False) - conn, _ = self.sock.accept() - request = conn.makefile().readline().rstrip() - self.assertEqual(request, "install 'mvn(gid:aid)'") -@@ -55,7 +55,7 @@ class PmRequestTest(unittest.TestCase): - def test_full_coords(self): - (out, err, proc) = call_script(self.scriptpath, - ['maven', 'gid:aid:ext:cla:ver'], -- extra_env=self.env, async=True) -+ extra_env=self.env, wait=False) - conn, _ = self.sock.accept() - request = conn.makefile().readline().rstrip() - self.assertEqual(request, "install 'mvn(gid:aid:ext:cla:ver)'") -@@ -67,7 +67,7 @@ class PmRequestTest(unittest.TestCase): - def test_connection_error(self): - (out, err, proc) = call_script(self.scriptpath, - ['maven', 'junit:junit'], -- extra_env=self.env, async=True) -+ extra_env=self.env, wait=False) - conn, _ = self.sock.accept() - conn.close() - ret = proc.wait() -diff --git a/test/test_common.py b/test/test_common.py -index 4000b6c..9bdc467 100644 ---- a/test/test_common.py -+++ b/test/test_common.py -@@ -24,7 +24,7 @@ for var in ('PYTHONPATH', 'COVERAGE_PROCESS_START'): - SCRIPT_ENV[var] = os.environ[var] - - --def call_script(name, args, stdin=None, extra_env={}, async=False): -+def call_script(name, args, stdin=None, extra_env={}, wait=True): - with open("tmpout", 'w') as outfile: - with open("tmperr", 'w') as errfile: - procargs = [sys.executable, name] -@@ -36,7 +36,7 @@ def call_script(name, args, stdin=None, extra_env={}, async=False): - env=env, - stdin=subprocess.PIPE, - universal_newlines=True) -- if async: -+ if not wait: - return (outfile, errfile, proc) - proc.communicate(stdin) - ret = proc.wait() --- -2.14.3 - diff --git a/0002-Backport-abrt-java-connector-changes.patch b/0002-Backport-abrt-java-connector-changes.patch deleted file mode 100644 index bf21b7b..0000000 --- a/0002-Backport-abrt-java-connector-changes.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 86f81bb751bedd9d3b3ecf98f0492d3446d808dd Mon Sep 17 00:00:00 2001 -From: Matej Habrnal -Date: Wed, 2 May 2018 11:47:16 +0200 -Subject: [PATCH 2/2] Backport abrt-java-connector changes - -Squashed from: - -change abrt-java-connector upstream URL - -abrt-java-connector upstream repository was moved from -https://github.com/jfilak/abrt-java-connector/ to -https://github.com/abrt/abrt-java-connector/ - -Signed-off-by: Matej Habrnal - -extend ABRT Java agent options - -If ABRT Java agent is enabled and container-exception-logger is -installed, pass cel=on parameter to libabrt-java-connector.so. - -Signed-off-by: Matej Habrnal ---- - etc/java.conf | 2 +- - java-utils/java-functions | 18 +++++++++++++----- - 2 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/etc/java.conf b/etc/java.conf -index 6af623a..81b24aa 100644 ---- a/etc/java.conf -+++ b/etc/java.conf -@@ -13,5 +13,5 @@ JNI_LIBDIR=@{jnidir} - #JAVACMD_OPTS= - - # You can disable ABRT Java Connector by setting JAVA_ABRT to "off". --# See: https://github.com/jfilak/abrt-java-connector/ -+# See: https://github.com/abrt/abrt-java-connector/ - #JAVA_ABRT=off -diff --git a/java-utils/java-functions b/java-utils/java-functions -index 0c157cc..eafcdd6 100644 ---- a/java-utils/java-functions -+++ b/java-utils/java-functions -@@ -106,12 +106,20 @@ _load_java_conf() - JAVACMD_OPTS="${java_opts_save}" - fi - -- if [ "_${JAVA_ABRT}" != "_off" -a -f "@{abrtlibdir}/libabrt-java-connector.so" -a -f "@{rundir}/abrt/abrtd.pid" ]; then -- _log "ABRT Java connector was enabled" -- _log "Using ABRT Java agent: @{abrtlibdir}/libabrt-java-connector.so" -- JAVACMD_OPTS="${JAVACMD_OPTS} -agentpath:@{abrtlibdir}/libabrt-java-connector.so=abrt=on" -+ if [ "_${JAVA_ABRT}" != "_off" -a -f "@{abrtlibdir}/libabrt-java-connector.so" ]; then -+ if [ -f "@{rundir}/abrt/abrtd.pid" ]; then -+ ABRT_JAVA_CONNECTOR_OPTS="abrt=on," -+ fi -+ if [ -f "@{bindir}/container-exception-logger" ]; then -+ ABRT_JAVA_CONNECTOR_OPTS+="cel=on" -+ fi -+ if [ ! -z ${ABRT_JAVA_CONNECTOR_OPTS} ]; then -+ _log "ABRT Java connector was enabled" -+ _log "Using ABRT Java agent: @{abrtlibdir}/libabrt-java-connector.so=${ABRT_JAVA_CONNECTOR_OPTS}" -+ JAVACMD_OPTS="${JAVACMD_OPTS} -agentpath:@{abrtlibdir}/libabrt-java-connector.so=${ABRT_JAVA_CONNECTOR_OPTS}" -+ fi - else -- _log "ABRT Java connector is disabled" -+ _log "ABRT Java connector is disabled" - fi - } - --- -2.17.0 - diff --git a/0002-Switch-auto-requires-generator-to-javapackages-files.patch b/0002-Switch-auto-requires-generator-to-javapackages-files.patch deleted file mode 100644 index bb54b79..0000000 --- a/0002-Switch-auto-requires-generator-to-javapackages-files.patch +++ /dev/null @@ -1,273 +0,0 @@ -From 196ecd91201986f1bb4e29e46f10bcab165f83df Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 2 Aug 2018 07:57:27 +0200 -Subject: [PATCH 2/2] Switch auto-requires generator to javapackages-filesystem - ---- - etc/javapackages-config.json | 4 ++-- - test/javadoc_req_test.py | 2 +- - test/maven_req_test.py | 50 ++++++++++++++++++++++---------------------- - 3 files changed, 28 insertions(+), 28 deletions(-) - -diff --git a/etc/javapackages-config.json b/etc/javapackages-config.json -index 767fb7a..601fedc 100644 ---- a/etc/javapackages-config.json -+++ b/etc/javapackages-config.json -@@ -1,7 +1,7 @@ - { - "maven.req": { - "always_generate": [ -- "javapackages-tools" -+ "javapackages-filesystem" - ], - "java_requires": { - "package_name": "java-headless", -@@ -16,7 +16,7 @@ - }, - "javadoc.req": { - "always_generate": [ -- "javapackages-tools" -+ "javapackages-filesystem" - ] - } - } -diff --git a/test/javadoc_req_test.py b/test/javadoc_req_test.py -index cfdde8b..6ac12ac 100644 ---- a/test/javadoc_req_test.py -+++ b/test/javadoc_req_test.py -@@ -8,7 +8,7 @@ class TestJavadocReq(unittest.TestCase): - @javadocreq(["something", "that's ignored anyway"]) - def test_javadoc(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) -- self.assertEqual("javapackages-tools\n", stdout) -+ self.assertEqual("javapackages-filesystem\n", stdout) - - @javadocreq([], javaconfdirs=["javadoc/first", "javadoc/second"]) - def test_configuration(self, stdout, stderr, return_value): -diff --git a/test/maven_req_test.py b/test/maven_req_test.py -index 5ea41a1..f8e2ac4 100644 ---- a/test/maven_req_test.py -+++ b/test/maven_req_test.py -@@ -21,7 +21,7 @@ class TestMavenReq(unittest.TestCase): - def test_require1(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "java-headless", -+ want = ("javapackages-filesystem", "java-headless", - "mvn(org.apache.maven:maven-project)") - self.assertEqual(set(want), set(sout)) - -@@ -29,7 +29,7 @@ class TestMavenReq(unittest.TestCase): - def test_require_java(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "mvn(org.apache.maven:maven-project)", -+ want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)", - "java-headless >= 1:1.6") - self.assertEqual(set(want), set(sout)) - -@@ -37,7 +37,7 @@ class TestMavenReq(unittest.TestCase): - def test_require_java2(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "mvn(org.apache.maven:maven-project)", -+ want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)", - "java-headless >= 1:1.8") - self.assertEqual(set(want), set(sout)) - -@@ -45,7 +45,7 @@ class TestMavenReq(unittest.TestCase): - def test_require_java3(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "mvn(org.apache.maven:maven-project)", -+ want = ("javapackages-filesystem", "mvn(org.apache.maven:maven-project)", - "java-headless >= 1:1.8") - self.assertEqual(set(want), set(sout)) - -@@ -59,7 +59,7 @@ class TestMavenReq(unittest.TestCase): - def test_require_parent(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "java-headless", -+ want = ("javapackages-filesystem", "java-headless", - "ns-mvn(org.codehaus.plexus:plexus-ant-factory)") - self.assertEqual(set(want), set(sout)) - -@@ -67,7 +67,7 @@ class TestMavenReq(unittest.TestCase): - def test_require_multi(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "ns-mvn(org.codehaus.plexus:plexus-ant-factory)", -+ want = ("javapackages-filesystem", "ns-mvn(org.codehaus.plexus:plexus-ant-factory)", - "ns-mvn(codehaus:plexus-utils) = 1.2", "java-headless", - "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)") - self.assertEqual(set(want), set(sout)) -@@ -76,7 +76,7 @@ class TestMavenReq(unittest.TestCase): - def test_require_multi_namespace(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "java-headless", -+ want = ("javapackages-filesystem", "java-headless", - "ns2-mvn(codehaus:plexus-cipher)", "ns-mvn(codehaus:plexus-utils)", - "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)") - self.assertEqual(set(want), set(sout)) -@@ -85,7 +85,7 @@ class TestMavenReq(unittest.TestCase): - def test_require_multi_versioned(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("java-headless", "javapackages-tools", -+ want = ("java-headless", "javapackages-filesystem", - "ns-mvn(org.codehaus.plexus:plexus-ant-factory:1.0) = 1.0", - "ns-mvn(codehaus:plexus-utils:1.2)", - "ns-mvn(codehaus:plexus-cipher:1.0) = 1.1", -@@ -97,7 +97,7 @@ class TestMavenReq(unittest.TestCase): - def test_mixed(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "java-headless", -+ want = ("javapackages-filesystem", "java-headless", - "ns-mvn(org.codehaus.plexus:plexus-ant-factory)", - "ns-mvn(codehaus:plexus-utils) = 1.2", - "mvn(org.apache.maven.wagon:wagon-provider-api::test-jar:)", -@@ -108,7 +108,7 @@ class TestMavenReq(unittest.TestCase): - def test_simple_subpackage(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "java-headless", -+ want = ("javapackages-filesystem", "java-headless", - "mvn(org.apache.maven:maven-plugin-api) = 3.2.1") - self.assertEqual(set(want), set(sout)) - -@@ -116,7 +116,7 @@ class TestMavenReq(unittest.TestCase): - def test_simple_subpackage2(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "java-headless", -+ want = ("javapackages-filesystem", "java-headless", - "mvn(org.apache.maven:maven-plugin-api) = 3.2.1", - "mvn(org.codehaus.plexus:plexus-utils)") - self.assertEqual(set(want), set(sout)) -@@ -125,7 +125,7 @@ class TestMavenReq(unittest.TestCase): - def test_simple_subpackage3(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "java-headless", -+ want = ("javapackages-filesystem", "java-headless", - "mvn(org.apache.maven:maven-plugin-api:3.2.0) = 3.2.1") - self.assertEqual(set(want), set(sout)) - -@@ -133,7 +133,7 @@ class TestMavenReq(unittest.TestCase): - def test_simple_subpackage4(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "java-headless", -+ want = ("javapackages-filesystem", "java-headless", - "mvn(org.apache.maven:maven-plugin-api)") - self.assertEqual(set(want), set(sout)) - -@@ -141,7 +141,7 @@ class TestMavenReq(unittest.TestCase): - def test_simple_artifact_in_same_package(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "java-headless") -+ want = ("javapackages-filesystem", "java-headless") - self.assertEqual(set(want), set(sout)) - - #test for rhbz#1012980 -@@ -159,7 +159,7 @@ class TestMavenReq(unittest.TestCase): - def test_rhbz1017701_c2(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "java-headless", -+ want = ("javapackages-filesystem", "java-headless", - "maven31-mvn(org.eclipse.aether:aether-api) = 0.9.0.M3") - self.assertEqual(set(want), set(sout)) - -@@ -206,7 +206,7 @@ class TestMavenReq(unittest.TestCase): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] - want = ("mvn(org.fedoraproject.xmvn:xmvn-core)", -- "java-headless", "javapackages-tools", -+ "java-headless", "javapackages-filesystem", - "mvn(org.fedoraproject.xmvn:xmvn-api)") - self.assertEqual(set(want), set(sout)) - -@@ -215,7 +215,7 @@ class TestMavenReq(unittest.TestCase): - def test_deps_from_pom_with_parent(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("mvn(plugin:external)", "javapackages-tools", -+ want = ("mvn(plugin:external)", "javapackages-filesystem", - "mvn(ppom:parent-pom:pom:)", "java-headless") - self.assertEqual(set(want), set(sout)) - -@@ -224,7 +224,7 @@ class TestMavenReq(unittest.TestCase): - def test_deps_from_pom_on_subpkg(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("mvn(extension:from-subpackage) = 1.1", "javapackages-tools", -+ want = ("mvn(extension:from-subpackage) = 1.1", "javapackages-filesystem", - "mvn(ppom:parent-pom:pom:)", "java-headless") - self.assertEqual(set(want), set(sout)) - -@@ -246,28 +246,28 @@ class TestMavenReq(unittest.TestCase): - def test_osgi_basic(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("osgi(osgi.req1)", "javapackages-tools", "java-headless") -+ want = ("osgi(osgi.req1)", "javapackages-filesystem", "java-headless") - self.assertEqual(set(want), set(sout)) - - @mavenreq(["osgi_self/buildroot/usr/share/maven-metadata/require.xml"]) - def test_osgi_self(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("javapackages-tools", "java-headless") -+ want = ("javapackages-filesystem", "java-headless") - self.assertEqual(set(want), set(sout)) - - @mavenreq(["osgi_versioned/buildroot/usr/share/maven-metadata/require.xml"]) - def test_osgi_versioned(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("osgi(osgi.req1) = 1.0", "javapackages-tools", "java-headless") -+ want = ("osgi(osgi.req1) = 1.0", "javapackages-filesystem", "java-headless") - self.assertEqual(set(want), set(sout)) - - @mavenreq(["osgi_versioned_ns/buildroot/usr/share/maven-metadata/require.xml"]) - def test_osgi_versioned_ns(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("devtoolset-3-osgi(osgi.req1) = 1.0", "javapackages-tools", "java-headless") -+ want = ("devtoolset-3-osgi(osgi.req1) = 1.0", "javapackages-filesystem", "java-headless") - self.assertEqual(set(want), set(sout)) - - @mavenreq(["dashes/buildroot/usr/share/maven-metadata/require.xml"]) -@@ -276,21 +276,21 @@ class TestMavenReq(unittest.TestCase): - sout = [x for x in stdout.split('\n') if x] - want = ("mvn(org.apache.maven:maven-plugin-api) = 1.alpha.2", - "osgi(osgi2) = 1.5.1.SNAPSHOT", -- "java-headless", "javapackages-tools") -+ "java-headless", "javapackages-filesystem") - self.assertEqual(set(want), set(sout)) - - @mavenreq(["require_optional/buildroot/usr/share/maven-metadata/require.xml"]) - def test_optional(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("mvn(dg:da)", "java-headless", "javapackages-tools") -+ want = ("mvn(dg:da)", "java-headless", "javapackages-filesystem") - self.assertEqual(set(want), set(sout)) - - @mavenreq(["require-no-artifacts/buildroot/usr/share/maven-metadata/require.xml"]) - def test_no_artifacts(self, stdout, stderr, return_value): - self.assertEqual(return_value, 0, stderr) - sout = [x for x in stdout.split('\n') if x] -- want = ("java-headless", "javapackages-tools") -+ want = ("java-headless", "javapackages-filesystem") - self.assertEqual(set(want), set(sout)) - - if __name__ == '__main__': --- -2.14.3 - diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 5cec4dd..6e93025 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -24,8 +24,8 @@ %global default_jre %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/jre-1.8.0-openjdk Name: javapackages-tools -Version: 5.2.0 -Release: 6%{?dist} +Version: 5.3.0 +Release: 1%{?dist} Summary: Macros and scripts for Java packaging support @@ -33,9 +33,6 @@ License: BSD URL: https://github.com/fedora-java/javapackages Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz -Patch0: 0001-Rename-the-async-kwarg-in-call_script-to-wait-revers.patch -Patch1: 0002-Switch-auto-requires-generator-to-javapackages-files.patch - BuildArch: noarch BuildRequires: coreutils @@ -156,8 +153,6 @@ This package provides non-essential macros and scripts to support Java packaging %prep %setup -q -n javapackages-%{version} -%patch0 -p1 -%patch1 -p1 %if %{without asciidoc} sed -i '/^manpage /d' build @@ -209,6 +204,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %license LICENSE %changelog +* Mon Aug 06 2018 Michael Simacek - 5.3.0-1 +- Update to upstream version 5.3.0 + * Thu Aug 2 2018 Mikolaj Izdebski - 5.2.0-6 - Switch auto-requires generator to javapackages-filesystem diff --git a/sources b/sources index 289acce..cf59247 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (5.2.0.tar.gz) = 9e21df1bb1d2b5a3ec94d88575df685f3e2a8ab9040722528a48eda07ff59abcddf96a93a0d7ab3501623e8ac42264c5a84cb625802a2d73b15954ab64d0e62e +SHA512 (5.3.0.tar.gz) = 41b5398cd276cf10c1e3ce1a8283ab9ef19df8a2ad19db20553ff31e31d26af9f14bb566574a3ee534a9af2cf1f1626086bf551b4bc6ed12bc0082c46b6b7e98