packages: java-xom/java-xom.spec - unify java spec - disable javadoc (it is...

[pawelz]

Author: pawelz                       Date: Wed Jan 20 12:33:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- unify java spec
- disable javadoc (it is broken)

---- Files affected:
packages/java-xom:
   java-xom.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/java-xom/java-xom.spec
diff -u packages/java-xom/java-xom.spec:1.2 packages/java-xom/java-xom.spec:1.3
--- packages/java-xom/java-xom.spec:1.2	Mon Feb  9 18:54:54 2009
+++ packages/java-xom/java-xom.spec	Wed Jan 20 13:33:48 2010
@@ -1,9 +1,14 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	javadoc		# don't build javadoc
+%bcond_with	javadoc		# don't build javadoc
 %bcond_without	tests		# don't build and run tests
 #
+%if "%{pld_release}" == "ti"
+%bcond_without	java_sun	# build with gcj
+%else
+%bcond_with	java_sun	# build with java-sun
+%endif
 %include	/usr/lib/rpm/macros.java
 #
 %define		srcname	xom
@@ -20,7 +25,9 @@
 # Source1-md5:	b598ae6b7e765a92e13667b0a80392f4
 Patch0:		%{name}-jaxen-build.patch
 URL:		http://www.cafeconleche.org/XOM/
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	java-xalan
 BuildRequires:	java-xerces
 BuildRequires:	java-xml-commons-external
@@ -76,7 +83,6 @@
 cd ..
 
 cat > build.properties << EOF
-build.compiler=gcj
 xml-apis.jar=$(find-jar xml-apis)
 parser.jar=$(find-jar xerces-j2)
 serializer.jar=$(find-jar serializer)
@@ -88,9 +94,11 @@
 rm -rf lib
 
 %build
-export SHELL=/bin/sh
 
-%ant -propertyfile build.properties minimal jar javadoc
+ANT_OPTS=-Xss64M %ant -propertyfile build.properties minimal jar
+%if %{with javadoc}
+%ant javadoc
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -104,9 +112,11 @@
 ln -s %{srcname}-minimal-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-minimal.jar
 
 # javadoc
+%if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
 cp -a build/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
 ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
+%endif
 
 # examples
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{srcname}-%{version}/nu/xom/samples/
@@ -127,10 +137,12 @@
 %defattr(644,root,root,755)
 %{_examplesdir}/%{srcname}-%{version}
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{srcname}-%{version}
 %ghost %{_javadocdir}/%{srcname}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -138,6 +150,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/01/20 12:33:48  pawelz
+- unify java spec
+- disable javadoc (it is broken)
+
 Revision 1.2  2009/02/09 17:54:54  pawelz
 - BR: java-gcj-compat-devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-xom/java-xom.spec?r1=1.2&r2=1.3&f=u