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

Accepting request 646351 from Java:packages

Browse Source 
replace /usr/lib by libdir also in configuration files

OBS-URL: https://build.opensuse.org/request/show/646351
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javapackages-tools?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2018-11-06 14:38:53 +00:00 committed by Git OBS Bridge
commit 8b8dcebc16
5 changed files with 121 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
5.3.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:73803877c26b3e6c0440b2e1e4d78a5fadf63782a62374df400b8badb1de3046
size 155460

3
javapackages-5.2.0+git20180620.70fa2258.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb6483258ffcae21358c77e7db34ff179d67f05d64e26226aed290f302fc6e82
size 116692

24
javapackages-tools.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Mon Nov 5 09:34:51 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Replace the occurences of /usr/lib by libdir in configuration
files too
-------------------------------------------------------------------
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
- Build the :extras flavour as noarch
-------------------------------------------------------------------
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
+ adapt the tests to not expect the epoch
-------------------------------------------------------------------
Tue Jul 24 14:09:47 UTC 2018 - tchvatal@suse.com

33
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/
#
@ -27,24 +27,27 @@ 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
#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: perl
BuildRequires: rpm
BuildRequires: xmlto
BuildRequires: xz
Requires: javapackages-filesystem = %{version}-%{release}
# Used on too many places
Provides: jpackage-utils = %{version}
Obsoletes: %{name}-doc
@ -54,11 +57,20 @@ BuildRequires: python3-lxml
BuildRequires: python3-nose
BuildRequires: python3-setuptools
BuildRequires: python3-six
BuildArch: noarch
%endif
%description
This package provides macros and scripts to support Java packaging.
%package -n javapackages-filesystem
Summary: Java packages filesystem layout
Group: Development/Languages/Java
%description -n javapackages-filesystem
This package provides some basic directories into which Java packages
install their content.
%if %{with python}
%package -n maven-local
Summary: Macros and scripts for Maven packaging support
@ -115,6 +127,10 @@ This package provides non-essential macros and scripts to support Java packaging
%setup -q -n javapackages-%{version}
%autopatch -p1
# The usr/lib is hardcoded in configuration files too
new_dir=$(echo %{_libdir} | sed 's#/##')
perl -pi -e "s#usr/lib#${new_dir}#g" configs/*.xml
%build
%configure \
%if %{with python}
@ -169,9 +185,6 @@ files="
for i in $files; do
rm -rf %{buildroot}/$i
done
%else
# we want this in the basic package always
cat files-filesystem >> files-tools
%endif
rm -rf %{buildroot}%{_datadir}/fedora-review/
@ -184,7 +197,9 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
%if !%{with python}
%files -f files-tools
%license LICENSE
%dir %{_datadir}/maven-metadata
%files -n javapackages-filesystem -f files-filesystem
%else
%files -n javapackages-local -f files-local
%dir %{_datadir}/java-utils

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

@ -0,0 +1,70 @@
--- 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 10:29:11.404375107 +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 _parse_java_requires(self, 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"])