From d013e14fae7bbbfeb0c06c4e49769850fee73a08 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:50 +0200 Subject: [PATCH 1/6] Mass rebuild for javapackages-tools 201901 --- xz-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index 9800643..9a34980 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -1,6 +1,6 @@ Name: xz-java Version: 1.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java implementation of XZ data compression License: Public Domain URL: http://tukaani.org/xz/java.html @@ -50,6 +50,9 @@ ant maven %license COPYING %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.8-3 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 09 2018 Fedora Release Engineering - 1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 0fe3c5754d259d4026bda3b2f8a65089ac18fe9c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 26 Oct 2019 11:53:12 +0200 Subject: [PATCH 2/6] Set compiler source/target to 1.6 --- xz-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index 9a34980..252c25e 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -35,7 +35,7 @@ This package contains the API documentation for %{name}. # package-list from oracle.com. Create a dummy package-list to prevent that. mkdir -p extdoc && touch extdoc/package-list -ant maven +ant maven -Dsourcever=1.6 %install %mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar From 246e9188de22a36dbb97e9751e8dbc0b2d373b5f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 3/6] Mass rebuild for javapackages-tools 201902 --- xz-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index 252c25e..6d684f6 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -1,6 +1,6 @@ Name: xz-java Version: 1.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java implementation of XZ data compression License: Public Domain URL: http://tukaani.org/xz/java.html @@ -50,6 +50,9 @@ ant maven -Dsourcever=1.6 %license COPYING %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.8-4 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1.8-3 - Mass rebuild for javapackages-tools 201901 From 7a5a4ce249f3ffaf94f4fa73ca321e290a60294d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 4/6] Conditionalize buildrequires in bootstrap mode --- xz-java.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xz-java.spec b/xz-java.spec index 6d684f6..8b3ee0b 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: xz-java Version: 1.8 Release: 4%{?dist} @@ -9,7 +11,11 @@ BuildArch: noarch Source0: http://tukaani.org/xz/xz-java-%{version}.zip BuildRequires: javapackages-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: ant +%endif %description A complete implementation of XZ data compression in Java. From 30925bd6f9d4ddf9f5d40317198fa9f2c38921e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 18:35:09 +0200 Subject: [PATCH 5/6] Use %ant macro --- xz-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index 8b3ee0b..2c69dbb 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -41,7 +41,7 @@ This package contains the API documentation for %{name}. # package-list from oracle.com. Create a dummy package-list to prevent that. mkdir -p extdoc && touch extdoc/package-list -ant maven -Dsourcever=1.6 +%ant maven -Dsourcever=1.6 %install %mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar From c6f59b243dd6e20a89031cec7d87c2f172e497c7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:43 +0200 Subject: [PATCH 6/6] Turn off bootstrap mode by default --- xz-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xz-java.spec b/xz-java.spec index 2c69dbb..6cf2970 100644 --- a/xz-java.spec +++ b/xz-java.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: xz-java Version: 1.8