SPECS: java-wsdl4j.spec - moved from wsdl4j - added with_java_sun bcond - d...

[pawelz]

Author: pawelz                       Date: Thu Mar 19 17:42:00 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- moved from wsdl4j
- added with_java_sun bcond
- dropped export SHELL=/bin/sh (no longer needed)

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

---- Diffs:

================================================================
Index: SPECS/java-wsdl4j.spec
diff -u SPECS/java-wsdl4j.spec:1.8 SPECS/java-wsdl4j.spec:1.9
--- SPECS/java-wsdl4j.spec:1.8	Mon Feb 23 17:10:47 2009
+++ SPECS/java-wsdl4j.spec	Thu Mar 19 18:41:54 2009
@@ -1,27 +1,33 @@
 # $Revision$, $Date$
 %bcond_without  javadoc         # don't build javadoc
+$bcond_with	java_sun	# use java-sun
 
 %include	/usr/lib/rpm/macros.java
+
+%define		srcname	wsdl4j
 Summary:	Web Services Description Language Toolkit for Java
 Summary(pl.UTF-8):	Język opisu usług WWW dla Javy
-Name:		wsdl4j
+Name:		java-wsdl4j
 Version:	1.5.1
 Release:	1
 License:	IBM Common Public License
 Group:		Applications/Text
 ##cvs -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j login
 ##cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/wsdl4j export -r wsdl4j-1_5_1 wsdl4j
-Source0:	%{name}-%{version}-src.tar.gz
+Source0:	%{srcname}-%{version}-src.tar.gz
 # Source0-md5:	ba2b623dadab131fff061410e8047eb7
 URL:		http://sourceforge.net/projects/wsdl4j/
 BuildRequires:	ant
 BuildRequires:	ant-junit
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:	java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires:	java-sun}
+BuildRequires:	java-junit
 BuildRequires:	jpackage-utils
-BuildRequires:	junit
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jaxp_parser_impl
+Obsoletes:	wsdl4j
+Provides:	wsdl4j
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -38,16 +44,17 @@
 służyć za wzorcową implementację standardu stworzonego przez JSR110.
 
 %package javadoc
-Summary:	Javadoc for %{name}
-Summary(pl.UTF-8):	Dokumentacja javadoc dla pakietu %{name}
+Summary:	Javadoc for %{srcname}
+Summary(pl.UTF-8):	Dokumentacja javadoc dla pakietu %{srcname}
 Group:		Documentation
 Requires:	jpackage-utils
+Obsoletes:	wsdl4j-javadoc
 
 %description javadoc
-Javadoc for %{name}.
+Javadoc for %{srcname}.
 
 %description javadoc -l pl.UTF-8
-Dokumentacja javadoc dla pakietu %{name}.
+Dokumentacja javadoc dla pakietu %{srcname}.
 
 %prep
 %setup -q
@@ -57,12 +64,9 @@
 CLASSPATH=$(build-classpath $required_jars)
 export CLASSPATH
 
-%ant -Dbuild.compiler=extJavac compile test
+%ant %{!?with_java_sun:-Dbuild.compiler=extJavac} compile test
 
-%if %{with javadoc}
-export SHELL=/bin/sh
-%ant javadocs
-%endif
+%{?with_javadoc:%ant javadocs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -75,15 +79,15 @@
 ln -s wsdl4j-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/wsdl4j.jar
 
 # javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a build/javadocs/* $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/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-ln -sf %{name}-%{version} %{_javadocdir}/%{name}
+ln -sf %{srcname}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -93,8 +97,8 @@
 %if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -103,6 +107,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2009/03/19 17:41:54  pawelz
+- moved from wsdl4j
+- added with_java_sun bcond
+- dropped export SHELL=/bin/sh (no longer needed)
+
 Revision 1.8  2009/02/23 16:10:47  pawelz
 - unified java package
 - use java-gcj-compat-devel
================================================================

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