diff --git a/.gitignore b/.gitignore index 2ced490..c102a4c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ SOURCES/commons-codec-1.8-src.tar.gz +/commons-codec-1.11-src.tar.gz diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 32d637c..3f0958d 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -1,51 +1,34 @@ -%global base_name codec -%global short_name commons-%{base_name} +Name: apache-commons-codec +Version: 1.11 +Release: 3%{?dist} +Summary: Implementations of common encoders and decoders +License: ASL 2.0 +URL: http://commons.apache.org/codec/ +BuildArch: noarch -Name: apache-%{short_name} -Version: 1.8 -Release: 7%{?dist} -Summary: Implementations of common encoders and decoders -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 +Source0: http://archive.apache.org/dist/commons/codec/source/commons-codec-%{version}-src.tar.gz # Data in DoubleMetaphoneTest.java originally has an inadmissible license. # The author gives MIT in e-mail communication. -Source1: aspell-mail.txt - - -BuildArch: noarch - -BuildRequires: java-devel -BuildRequires: jpackage-utils -BuildRequires: maven-local -BuildRequires: apache-commons-parent >= 26-7 -BuildRequires: maven-antrun-plugin -BuildRequires: maven-assembly-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-doxia-sitetools -BuildRequires: maven-plugin-bundle +Source1: aspell-mail.txt +BuildRequires: maven-local +BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) %description Commons Codec is an attempt to provide definitive implementations of commonly used encoders and decoders. Examples include Base64, Hex, Phonetic and URLs. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -%{summary}. +%{?javadoc_package} %prep -%setup -q -n %{short_name}-%{version}-src +%autosetup -n commons-codec-%{version}-src cp %{SOURCE1} aspell-mail.txt sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt -# compatibility symlinks and aliases -%mvn_file : %{name} %{short_name} -%mvn_alias : %{short_name}:%{short_name} +%mvn_file : commons-codec %{name} +%mvn_alias : commons-codec:commons-codec %build %mvn_build @@ -54,20 +37,52 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %mvn_install %files -f .mfiles -%doc LICENSE.txt NOTICE.txt RELEASE-NOTES* aspell-mail.txt - -%files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt aspell-mail.txt +%license LICENSE.txt NOTICE.txt aspell-mail.txt +%doc RELEASE-NOTES* %changelog -* Fri Dec 27 2013 Daniel Mach - 1.8-7 -- Mass rebuild 2013-12-27 +* Wed Feb 07 2018 Fedora Release Engineering - 1.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -* Fri Sep 20 2013 Mikolaj Izdebski - 1.8-6 -- Add BuildRequires on apache-commons-parent >= 26-7 +* Mon Jan 29 2018 Mikolaj Izdebski - 1.11-2 +- Cleanup spec file -* Mon Aug 19 2013 Stanislav Ochotnicky - 1.8-5 -- Migrate away from mvn-rpmbuild (#997446) +* Fri Nov 24 2017 Mat Booth - 1.11-1 +- Update to latest upstream version + +* Wed Jul 26 2017 Fedora Release Engineering - 1.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 1.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 1.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Mon Nov 17 2014 Mat Booth - 1.10-1 +- Update to upstream version 1.10 + +* Tue Oct 14 2014 Mikolaj Izdebski - 1.9-5 +- Remove legacy Obsoletes/Provides for jakarta-commons + +* Wed Jul 30 2014 Mat Booth - 1.9-4 +- Fix incorrect parent BR causing FTBFS + +* Sat Jun 07 2014 Fedora Release Engineering - 1.9-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.9-2 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Jan 6 2014 Mikolaj Izdebski - 1.9-1 +- Update to upstream version 1.9 +- Update to current packaging guidelines + +* Sat Aug 03 2013 Fedora Release Engineering - 1.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild * Mon Jul 08 2013 Tomas Radej - 1.8-4 - Fixed license tag (MIT is only in test that doesn't make it into binary RPM) @@ -117,7 +132,7 @@ sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt - Build with maven 3. - Adapt to current guidelines. -* Thu Feb 10 2011 mbooth 1.4-12 +* Thu Feb 10 2011 mbooth 1.4-12 - Drop versioned jars and javadocs. * Mon Feb 07 2011 Fedora Release Engineering - 1.4-11 diff --git a/sources b/sources index da13ffa..80f318d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA1 (commons-codec-1.8-src.tar.gz) = 26f86615df1752c4d394572bfef52a7063ba33e4 +SHA512 (commons-codec-1.11-src.tar.gz) = b3159308f28b2fc50208421412d8cc81f439cc07dc3d071df7b50f2d862aab65b3d20bc8eb2906367a05ecf5138c56b5f12c6cf9c224def8b8286fe12ac5346f