pool/javapackages-tools
SHA256
4
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=89

Browse Source
This commit is contained in:
Fridrich Strba 2021-05-26 18:31:31 +00:00 committed by Git OBS Bridge
parent 0ef5e5655a
commit d68afaf5e1
3 changed files with 21 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
javapackages-tools.changes
View File

@ -1,11 +1,3 @@
-------------------------------------------------------------------
Tue May 25 06:55:37 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* sorted-aliases.patch
+ Always output aliases in alphabetical order in order to
have reproducible builds (bsc#1110028)
-------------------------------------------------------------------
Thu Mar 25 16:27:58 UTC 2021 - Ben Greiner <code@bnavigator.de>

44
javapackages-tools.spec
View File

@ -30,6 +30,25 @@ Name: javapackages-tools-%{flavor}
%else
Name: javapackages-tools
%endif
%if %{with python}
%if 0%{?suse_version} >= 1550
# TW: generate subpackages for every python3 flavor
%define python_subpackage_only 1
%else
%python_subpackages
%define python_sitelib %{python3_sitelib}
%define python_files() -n python3-%{**}
%endif
BuildRequires: %{python_module lxml}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six}
BuildRequires: python-rpm-macros
BuildArch: noarch
%else
Provides: mvn(com.sun:tools) = SYSTEM
Provides: mvn(sun.jdk:jconsole) = SYSTEM
%endif
Version: 5.3.1
Release: 0
Summary: Macros and scripts for Java packaging support
@ -45,40 +64,19 @@ 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
#PATCH-FIX-SUSE: Sort the aliases to avoid unnecessary difference between packages
Patch3: sorted-aliases.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl
BuildRequires: rpm
BuildRequires: xmlto
%if %{with python}
BuildRequires: javapackages-filesystem
%else
Requires: javapackages-filesystem = %{version}-%{release}
%endif
# Used on too many places
Provides: jpackage-utils = %{version}
Obsoletes: %{name}-doc
Obsoletes: jpackage-utils < %{version}
%if %{with python}
BuildRequires: %{python_module lxml}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module six}
BuildRequires: python-rpm-macros
BuildArch: noarch
%if 0%{?suse_version} >= 1550
# TW: generate subpackages for every python3 flavor
%define python_subpackage_only 1
%python_subpackages
BuildRequires: javapackages-filesystem
%else
%define python_sitelib %python3_sitelib
%define python_files() -n python3-%{**}
%endif
%else
Provides: mvn(com.sun:tools) = SYSTEM
Provides: mvn(sun.jdk:jconsole) = SYSTEM
Requires: javapackages-filesystem = %{version}-%{release}
%endif
%description

11
sorted-aliases.patch
View File

@ -1,11 +0,0 @@
--- javapackages-5.3.1/java-utils/maven_depmap.py 2019-06-14 12:26:27.000000000 +0200
+++ javapackages-5.3.1/java-utils/maven_depmap.py 2021-05-25 07:21:15.947065331 +0200
@@ -180,7 +180,7 @@
aliases = additions.split(',')
result = list()
- for a in aliases:
+ for a in sorted(aliases):
alias = MetadataAlias.from_mvn_str(a)
alias.extension = artifact.extension
result.append(alias)