From cbaefd1192392a338962bb6bd6077cf8fa6705d9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 1/9] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 0a555bb..bd9f542 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc8391e84cfdb170fcd8279aa370019f jdom-1.1.3.tar.gz +SHA512 (jdom-1.1.3.tar.gz) = a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278 From 0bc067629d181bce2816f1c9934d098bc1f61e29 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 2/9] Remove explicit Epoch --- jdom.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jdom.spec b/jdom.spec index b995512..19bf235 100644 --- a/jdom.spec +++ b/jdom.spec @@ -31,7 +31,6 @@ Name: jdom Version: 1.1.3 Release: 17%{?dist} -Epoch: 0 Summary: Java alternative to DOM and SAX License: Saxpath URL: http://www.jdom.org/ @@ -64,7 +63,7 @@ Javadoc for %{name}. %package demo Summary: Demos for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description demo Demonstrations and samples for %{name}. From 087346821b1c3fa0d1639a475cb2783af5ab5b62 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:49 +0200 Subject: [PATCH 3/9] Mass rebuild for javapackages-tools 201901 --- jdom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom.spec b/jdom.spec index 19bf235..0cb2bf0 100644 --- a/jdom.spec +++ b/jdom.spec @@ -30,7 +30,7 @@ Name: jdom Version: 1.1.3 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Java alternative to DOM and SAX License: Saxpath URL: http://www.jdom.org/ @@ -103,6 +103,9 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name} %license LICENSE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.1.3-18 +- Mass rebuild for javapackages-tools 201901 + * Fri Aug 03 2018 Michael Simacek - 0:1.1.3-17 - Correct license to Saxpath From 7437104713fabff175e4dd4b46e3447c1d1bb681 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 28 Oct 2019 14:52:31 +0100 Subject: [PATCH 4/9] Set compiler source/target levels to 1.6 --- jdom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdom.spec b/jdom.spec index 0cb2bf0..74168a4 100644 --- a/jdom.spec +++ b/jdom.spec @@ -79,7 +79,7 @@ find . -name "*.class" -exec rm -f {} \; %build export CLASSPATH=$(build-classpath xerces-j2 jaxen) -ant -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link +ant -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link %install %mvn_file : %{name} From 2194153a8bdf5e02194086e861167fa2cfe671cc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 5/9] Mass rebuild for javapackages-tools 201902 --- jdom.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom.spec b/jdom.spec index 74168a4..ec0372f 100644 --- a/jdom.spec +++ b/jdom.spec @@ -30,7 +30,7 @@ Name: jdom Version: 1.1.3 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Java alternative to DOM and SAX License: Saxpath URL: http://www.jdom.org/ @@ -103,6 +103,9 @@ cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name} %license LICENSE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.1.3-19 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1.1.3-18 - Mass rebuild for javapackages-tools 201901 From 0e8db3cfe5efb05b801985d8840608f6f15c5648 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Apr 2020 09:24:11 +0200 Subject: [PATCH 6/9] Remove unneeded deps --- jdom.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jdom.spec b/jdom.spec index ec0372f..a430f31 100644 --- a/jdom.spec +++ b/jdom.spec @@ -42,9 +42,6 @@ Patch1: %{name}-1.1-OSGiManifest.patch BuildRequires: ant BuildRequires: javapackages-local -BuildRequires: mvn(jaxen:jaxen) -BuildRequires: mvn(xerces:xercesImpl) - BuildArch: noarch %description @@ -78,7 +75,6 @@ find . -name "*.jar" -exec rm -f {} \; find . -name "*.class" -exec rm -f {} \; %build -export CLASSPATH=$(build-classpath xerces-j2 jaxen) ant -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link %install From 2bceba152ff3552ba73958ef560084d44559aae7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 7/9] Conditionalize buildrequires in bootstrap mode --- jdom.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jdom.spec b/jdom.spec index a430f31..3d24411 100644 --- a/jdom.spec +++ b/jdom.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + # Copyright (c) 2000-2012, JPackage Project # All rights reserved. # @@ -39,8 +41,12 @@ Source1: http://repo1.maven.org/maven2/org/jdom/jdom/%{version}/jdom-%{ve Patch0: %{name}-crosslink.patch Patch1: %{name}-1.1-OSGiManifest.patch -BuildRequires: ant BuildRequires: javapackages-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: ant +%endif BuildArch: noarch From 13409155a23dbd200412e6b4bdb2e4d110c535c4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 18:30:21 +0200 Subject: [PATCH 8/9] Use %ant macro --- jdom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdom.spec b/jdom.spec index 3d24411..cd2161f 100644 --- a/jdom.spec +++ b/jdom.spec @@ -81,7 +81,7 @@ find . -name "*.jar" -exec rm -f {} \; find . -name "*.class" -exec rm -f {} \; %build -ant -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link +%ant -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java package javadoc-link %install %mvn_file : %{name} From ef357890c678dd609a24285447b3b3c4e586da9e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 9/9] Turn off bootstrap mode by default --- jdom.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdom.spec b/jdom.spec index cd2161f..e05181e 100644 --- a/jdom.spec +++ b/jdom.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap # Copyright (c) 2000-2012, JPackage Project # All rights reserved.