rpm/javapackages-tools
SHA256
1
0
Fork 0
forked from pool/javapackages-tools
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=50

Browse Source
This commit is contained in:
Fridrich Strba 2018-10-24 08:31:07 +00:00 committed by Git OBS Bridge
parent c40b272e79
commit 3618a18e7b
1 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
suse-no-epoch.patch
View File

@ -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-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 @@ @@ -295,9 +295,9 @@
def _get_java_requires(self, reqs): def _get_java_requires(self, reqs):
major, minor = max([self._parse_java_requires(x) for x in reqs]) major, minor = max([self._parse_java_requires(x) for x in reqs])
@ -12,3 +12,59 @@
def _parse_java_requires(self, req): def _parse_java_requires(self, req):
match = re.match(r'^(\d+)(?:\.(\d+))?$', 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"])