SPECS: wsdl4j.spec - unified java package - use java-gcj-compat-devel - rel 1

[pawelz]

Author: pawelz                       Date: Mon Feb 23 16:10:53 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified java package
- use java-gcj-compat-devel
- rel 1

---- Files affected:
SPECS:
   wsdl4j.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/wsdl4j.spec
diff -u SPECS/wsdl4j.spec:1.7 SPECS/wsdl4j.spec:1.8
--- SPECS/wsdl4j.spec:1.7	Wed Apr 18 01:41:31 2007
+++ SPECS/wsdl4j.spec	Mon Feb 23 17:10:47 2009
@@ -1,10 +1,12 @@
 # $Revision$, $Date$
+%bcond_without  javadoc         # don't build javadoc
+
 %include	/usr/lib/rpm/macros.java
 Summary:	Web Services Description Language Toolkit for Java
 Summary(pl.UTF-8):	Język opisu usług WWW dla Javy
 Name:		wsdl4j
 Version:	1.5.1
-Release:	0.1
+Release:	1
 License:	IBM Common Public License
 Group:		Applications/Text
 ##cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j login
@@ -14,12 +16,11 @@
 URL:		http://sourceforge.net/projects/wsdl4j/
 BuildRequires:	ant
 BuildRequires:	ant-junit
-BuildRequires:	jdk
+BuildRequires:	java-gcj-compat-devel
 BuildRequires:	jpackage-utils
 BuildRequires:	junit
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
-Requires:	java
 Requires:	jaxp_parser_impl
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,9 +54,15 @@
 
 %build
 required_jars="junit"
-export CLASSPATH=$(build-classpath $required_jars)
-%ant compile test javadocs \
-	-Dbuild.compiler=modern
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
+
+%ant -Dbuild.compiler=extJavac compile test
+
+%if %{with javadoc}
+export SHELL=/bin/sh
+%ant javadocs
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -83,9 +90,12 @@
 %doc license.html
 %{_javadir}/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -93,6 +103,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2009/02/23 16:10:47  pawelz
+- unified java package
+- use java-gcj-compat-devel
+- rel 1
+
 Revision 1.7  2007/04/17 23:41:31  glen
 - fix symlinks
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/wsdl4j.spec?r1=1.7&r2=1.8&f=u