SPECS: java-xml-commons-external.spec - renamed from java-xml-commons-exter...

[pawelz]

Author: pawelz                       Date: Mon Feb  2 09:50:36 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- renamed from java-xml-commons-external
- BR: java-gcj-compat-devel (not java-gcj-compat)

---- Files affected:
SPECS:
   java-xml-commons-external.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/java-xml-commons-external.spec
diff -u SPECS/java-xml-commons-external.spec:1.6 SPECS/java-xml-commons-external.spec:1.7
--- SPECS/java-xml-commons-external.spec:1.6	Sat Jan 31 01:21:07 2009
+++ SPECS/java-xml-commons-external.spec	Mon Feb  2 10:50:31 2009
@@ -3,20 +3,22 @@
 # - something with org.apache.env.which (currently xml-commons-which.jar in
 #   xml-commons), then obsolete xml-commons here
 %include	/usr/lib/rpm/macros.java
+#
+%define	srcname	xml-commons-external
 Summary:	Apache XML Commons External classes
 Summary(pl.UTF-8):	Klasy Apache XML Commons External
-Name:		xml-commons-external
+Name:		java-xml-commons-external
 Version:	1.3.04
 Release:	2
 License:	Apache v2.0
 Group:		Development/Languages/Java
-Source0:	http://www.apache.org/dist/xml/commons/%{name}-%{version}-src.tar.gz
+Source0:	http://www.apache.org/dist/xml/commons/%{srcname}-%{version}-src.tar.gz
 # Source0-md5:	5536f87a816c766f4999ed60593a8701
 # from http://svn.apache.org/repos/asf/xml/commons/trunk/java/external/build.xml
-Source1:	%{name}-build.xml
+Source1:	%{srcname}-build.xml
 URL:		http://xml.apache.org/commons/
 BuildRequires:	ant
-BuildRequires:	java-gcj-compat
+BuildRequires:	java-gcj-compat-devel
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
@@ -57,7 +59,7 @@
 %build
 # default 64m is too low
 #export ANT_OPTS="-Xmx128m"
-%ant jar javadoc
+%ant -Dbuild.compiler=gcj jar javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,15 +70,15 @@
 ln -s xml-apis-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-apis.jar
 ln -s xml-apis-ext-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-apis-ext.jar
 
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a build/docs/javadoc/* $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 build/docs/javadoc/* $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)
@@ -85,8 +87,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
@@ -94,6 +96,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2009/02/02 09:50:31  pawelz
+- renamed from java-xml-commons-external
+- BR: java-gcj-compat-devel (not java-gcj-compat)
+
 Revision 1.6  2009/01/31 00:21:07  pawelz
 - build it with gnu java
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-xml-commons-external.spec?r1=1.6&r2=1.7&f=u