diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec index 8455be2..ef5feac 100644 --- a/apache-commons-codec.spec +++ b/apache-commons-codec.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Implementations of common encoders and decoders Group: Development/Libraries License: ASL 2.0 @@ -14,8 +14,9 @@ Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{shor BuildArch: noarch -BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: java-devel BuildRequires: jpackage-utils +BuildRequires: maven-local BuildRequires: maven-antrun-plugin BuildRequires: maven-assembly-plugin BuildRequires: maven-compiler-plugin @@ -28,7 +29,7 @@ BuildRequires: maven-doxia-sitetools BuildRequires: maven-plugin-bundle BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit4 -Requires: java >= 1:1.6.0 +Requires: java Requires: jpackage-utils # It looks like there are packages in F-18 that BR/R the short name @@ -61,7 +62,7 @@ Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release} sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt %build -mvn-rpmbuild install javadoc:javadoc +mvn-rpmbuild install javadoc:aggregate %install # jars @@ -90,6 +91,10 @@ install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom %{_javadocdir}/%{name} %changelog +* Mon Feb 18 2013 Java SIG - 1.7-4 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + * Wed Feb 13 2013 Fedora Release Engineering - 1.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild