From d2f2bbb586e855e619a5b06167c783ee7b5edba0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 1/4] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 32fef78..b5690d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -37ee469f4caff6cfa28f9d0a0be2d4d2 commons-lang-2.6-src.tar.gz +SHA512 (commons-lang-2.6-src.tar.gz) = 4a30ed153f93fe6616a28974721bdf005d064203ef8a3dd375d6c1176647c0cdbd29cfde2a580e2c8d26bfa4655be6be7025b8ccae94086dcd816676c5cf8e87 From e6d4e7d9fa31e019961cd0e69d6639c1590662d1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:48:42 +0000 Subject: [PATCH 2/4] Remove Group tags --- apache-commons-lang.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 2975915..9f6b15c 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -7,7 +7,6 @@ Version: 2.6 Release: 21%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 -Group: Development/Libraries URL: http://commons.apache.org/%{base_name} Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Patch1: 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch @@ -31,7 +30,6 @@ as hashCode, toString and equals. %package javadoc Summary: API documentation for %{name} -Group: Documentation %description javadoc %{summary}. From c3b1e9cecee13c2bdaa1b63cb9eeab0bbbe93fa1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:18 +0200 Subject: [PATCH 3/4] Mass rebuild for javapackages-tools 201901 --- apache-commons-lang.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 9f6b15c..6584087 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 2.6 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 URL: http://commons.apache.org/%{base_name} @@ -62,6 +62,9 @@ sed -i 's/\r//' *.txt *.html %doc LICENSE.txt NOTICE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 2.6-22 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 2.6-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 32f1c7783cbb03e6aa5faed22a9b5ff638c1ae0e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 08:28:48 +0200 Subject: [PATCH 4/4] Disable javadoc package --- apache-commons-lang.spec | 52 ++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/apache-commons-lang.spec b/apache-commons-lang.spec index 6584087..7476873 100644 --- a/apache-commons-lang.spec +++ b/apache-commons-lang.spec @@ -1,20 +1,18 @@ - -%global base_name lang -%global short_name commons-%{base_name} - -Name: apache-%{short_name} +Name: apache-commons-lang Version: 2.6 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Provides a host of helper utilities for the java.lang API License: ASL 2.0 -URL: http://commons.apache.org/%{base_name} -Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +URL: http://commons.apache.org/lang +BuildArch: noarch + +Source0: http://archive.apache.org/dist/commons/lang/source/commons-lang-%{version}-src.tar.gz + Patch1: 0002-Fix-FastDateFormat-for-Java-7-behaviour.patch -BuildArch: noarch BuildRequires: maven-local -BuildRequires: apache-commons-parent -BuildRequires: maven-surefire-provider-junit +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) %description The standard Java libraries fail to provide enough methods for @@ -28,40 +26,30 @@ exception structure that supports multiple types of nested-Exceptions and a series of utilities dedicated to help with building methods, such as hashCode, toString and equals. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -%{summary}. - %prep -%setup -q -n %{short_name}-%{version}-src +%setup -q -n commons-lang-%{version}-src %patch1 -p1 sed -i 's/\r//' *.txt *.html -# "enum" is used as a Java identifier, which is prohibited in Java >= 1.5 -%pom_add_plugin org.apache.maven.plugins:maven-javadoc-plugin . " - 1.3" - - -%mvn_file : %{name} %{short_name} -%mvn_alias : org.apache.commons: %{base_name}:%{base_name} -# this package needs to be compiled with -source 1.3 option -%mvn_config buildSettings/compilerSource 1.3 +%mvn_file : %{name} commons-lang +%mvn_alias : org.apache.commons: lang:lang %build -%mvn_build +# "enum" is used as a Java identifier, which is prohibited in Java >= 1.5 +# Likewise, javadoc fails to generate due to "enum" +%mvn_build -j -- -Dmaven.compiler.source=1.3 -Dmaven.compiler.target=1.3 %install %mvn_install %files -f .mfiles -%doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt - -%files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt +%doc PROPOSAL.html RELEASE-NOTES.txt %changelog +* Fri Jun 28 2019 Mikolaj Izdebski - 2.6-23 +- Disable javadoc package + * Fri May 24 2019 Mikolaj Izdebski - 2.6-22 - Mass rebuild for javapackages-tools 201901