SPECS: java-commons-codec.spec - rebuild with java-gcj-compat-devel - corre...

[pawelz]

Author: pawelz                       Date: Tue Feb 17 07:12:28 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rebuild with java-gcj-compat-devel
- correct dir for javadoc
- rel 5

---- Files affected:
SPECS:
   java-commons-codec.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/java-commons-codec.spec
diff -u SPECS/java-commons-codec.spec:1.12 SPECS/java-commons-codec.spec:1.13
--- SPECS/java-commons-codec.spec:1.12	Mon Feb  2 13:28:35 2009
+++ SPECS/java-commons-codec.spec	Tue Feb 17 08:12:23 2009
@@ -1,10 +1,11 @@
 # $Revision$, $Date$
 %include	/usr/lib/rpm/macros.java
+%define		srcname	commons-codec
 Summary:	Commons Codec Package
 Summary(pl.UTF-8):	Pakiet Commons Codec
 Name:		java-commons-codec
 Version:	1.3
-Release:	4
+Release:	5
 License:	Apache
 Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/codec/source/commons-codec-%{version}-src.tar.gz
@@ -13,6 +14,7 @@
 URL:		http://commons.apache.org/codec/
 BuildRequires:	ant >= 1.6.2
 BuildRequires:	ant-junit
+BuildRequires:	java-gcj-compat-devel
 BuildRequires:	jpackage-utils
 BuildRequires:	junit
 BuildRequires:	rpm-javaprov
@@ -64,8 +66,9 @@
 required_jars="junit"
 CLASSPATH=$(build-classpath $required_jars)
 export CLASSPATH
+export SHELL=/bin/sh
 
-%ant dist
+%ant -Dbuild.compiler=extJavac dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -73,19 +76,19 @@
 
 # jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-cp -a dist/commons-codec-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
-ln -s commons-codec-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-codec.jar
+cp -a dist/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
 # javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
@@ -94,8 +97,8 @@
 
 %files javadoc
 %defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -103,6 +106,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2009/02/17 07:12:23  pawelz
+- rebuild with java-gcj-compat-devel
+- correct dir for javadoc
+- rel 5
+
 Revision 1.12  2009/02/02 12:28:35  glen
 - Libraries/Java group
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-codec.spec?r1=1.12&r2=1.13&f=u