pool/javapackages-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fridrich Strba 2018-10-24 08:03:19 +00:00 committed by Git OBS Bridge
parent 5f4189fd6f
commit 5cf011d632
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
javapackages-tools.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
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
+ fix a potential generation of unresolvable requires
-------------------------------------------------------------------
Tue Jul 24 14:09:47 UTC 2018 - tchvatal@suse.com

5
javapackages-tools.spec
View File

@ -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

11
suse-no-epoch.patch Normal file
View File

@ -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', [])