rpms/jakarta-commons-codec/devel jakarta-commons-codec.spec, 1.24, 1.25

[mbooth]

Author: mbooth

Update of /cvs/pkgs/rpms/jakarta-commons-codec/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25200/jakarta-commons-codec/devel

Modified Files:
	jakarta-commons-codec.spec 
Log Message:
* Sat Nov 7 2009 Mat Booth <fedora at matbooth.co.uk> - 1.4-2
- Add all maven related build reqs
- Require Java 1.6 because tests fail on GCJ


Index: jakarta-commons-codec.spec
===================================================================
RCS file: /cvs/pkgs/rpms/jakarta-commons-codec/devel/jakarta-commons-codec.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- jakarta-commons-codec.spec	7 Nov 2009 11:53:11 -0000	1.24
+++ jakarta-commons-codec.spec	7 Nov 2009 15:50:13 -0000	1.25
@@ -3,13 +3,13 @@
 # TODO - Drop "jakarta-" from the package name
 Name:          jakarta-%{short_name}
 Version:       1.4
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Implementations of common encoders and decoders
 Group:         Development/Libraries/Java
 License:       ASL 2.0
 URL:           http://commons.apache.org/codec/
 
-Source0:       http://mirrors.dedipower.com/ftp.apache.org/commons/codec/source/%{short_name}-%{version}-src.tar.gz
+Source0:       http://archive.apache.org/dist/commons/codec/source/%{short_name}-%{version}-src.tar.gz
 
 # Fix a regression in Base64 chunking behaviour, see upstream bug:
 # https://issues.apache.org/jira/browse/CODEC-89
@@ -19,9 +19,21 @@ BuildRoot:     %{_tmppath}/%{name}-%{ver
 
 BuildArch:     noarch
 
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
-Requires:      java
+BuildRequires: maven2-plugin-antrun
+BuildRequires: maven2-plugin-assembly
+BuildRequires: maven2-plugin-compiler
+BuildRequires: maven2-plugin-idea
+BuildRequires: maven2-plugin-install
+BuildRequires: maven2-plugin-jar
+BuildRequires: maven2-plugin-javadoc
+BuildRequires: maven2-plugin-resources
+BuildRequires: maven-doxia-sitetools
+BuildRequires: maven-plugin-bundle
+BuildRequires: maven-surefire-maven-plugin
+BuildRequires: maven-surefire-provider-junit
+Requires:      java >= 1:1.6.0
 Requires:      jpackage-utils
 
 Provides:      %{short_name} = %{version}-%{release}
@@ -89,9 +101,13 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Nov 7 2009 Mat Booth <fedora at matbooth.co.uk> - 1.4-2
+- Add all maven related build reqs
+- Require Java 1.6 because tests fail on GCJ
+
 * Sat Nov 7 2009 Mat Booth <fedora at matbooth.co.uk> - 1.4-1
 - Update to 1.4
-- Rewrite spec file to build using upstream-prefered maven instead of ant
+- Rewrite spec file to build using upstream-preferred maven instead of ant
 - Drop patch to add OSGi manifest (done automatically in the maven build)
 - Install pom and add to maven dep-map
 - Re-enable all tests