2018-10-24 08:21:02 +00:00
|
|
|
--- 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)
|
2018-10-24 08:03:19 +00:00
|
|
|
|
2018-10-24 08:21:02 +00:00
|
|
|
def _parse_java_requires(self, req):
|
|
|
|
|
match = re.match(r'^(\d+)(?:\.(\d+))?$', req)
|
