This commit is contained in:
parent
5cf011d632
commit
c40b272e79
3
5.3.0.tar.gz
Normal file
3
5.3.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:73803877c26b3e6c0440b2e1e4d78a5fadf63782a62374df400b8badb1de3046
|
||||
size 155460
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fb6483258ffcae21358c77e7db34ff179d67f05d64e26226aed290f302fc6e82
|
||||
size 116692
|
@ -1,9 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 24 08:19:24 UTC 2018 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- 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 <fstrba@suse.com>
|
||||
|
||||
- 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user