From d68afaf5e1b3d417ce742ee215fb91eb9a81f4aa3a62cc5b65fb5bfc79f72ca5 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 26 May 2021 18:31:31 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=89

---
 javapackages-tools.changes |  8 -------
 javapackages-tools.spec    | 44 ++++++++++++++++++--------------------
 sorted-aliases.patch       | 11 ----------
 3 files changed, 21 insertions(+), 42 deletions(-)
 delete mode 100644 sorted-aliases.patch

diff --git a/javapackages-tools.changes b/javapackages-tools.changes
index 059cb2c..6bfd391 100644
--- a/javapackages-tools.changes
+++ b/javapackages-tools.changes
@@ -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>
 
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 40fb53d..d8b4b3f 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -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
diff --git a/sorted-aliases.patch b/sorted-aliases.patch
deleted file mode 100644
index 111461a..0000000
--- a/sorted-aliases.patch
+++ /dev/null
@@ -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)