SPECS: wsdl4j.spec - unify java package; builds now

[glen]

Author: glen                         Date: Tue Apr 17 22:21:06 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
-  unify java package; builds now

---- Files affected:
SPECS:
   wsdl4j.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/wsdl4j.spec
diff -u SPECS/wsdl4j.spec:1.5 SPECS/wsdl4j.spec:1.6
--- SPECS/wsdl4j.spec:1.5	Mon Feb 12 23:09:21 2007
+++ SPECS/wsdl4j.spec	Wed Apr 18 00:21:01 2007
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%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
@@ -12,8 +13,12 @@
 # Source0-md5:	ba2b623dadab131fff061410e8047eb7
 URL:		http://sourceforge.net/projects/wsdl4j/
 BuildRequires:	ant
+BuildRequires:	ant-junit
 BuildRequires:	jdk
+BuildRequires:	jpackage-utils
 BuildRequires:	junit
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	java
 Requires:	jaxp_parser_impl
 BuildArch:	noarch
@@ -35,6 +40,7 @@
 Summary:	Javadoc for %{name}
 Summary(pl.UTF-8):	Dokumentacja javadoc dla pakietu %{name}
 Group:		Documentation
+Requires:	jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -46,44 +52,36 @@
 %setup -q
 
 %build
-export OPT_JAR_LIST="ant/ant-junit junit"
-[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-#ant -Dbuild.compiler=modern compile
-#ant -Dbuild.compiler=modern javadocs
-ant -Dbuild.compiler=modern compile test javadocs
+required_jars="junit"
+export CLASSPATH=$(build-classpath $required_jars)
+%ant compile test javadocs \
+	-Dbuild.compiler=modern
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # jars
 install -d $RPM_BUILD_ROOT%{_javadir}
-
-for jar in %{name}.jar qname.jar ; do
-	vjar=$(echo $jar | sed s+.jar+-%{version}.jar+g)
-	install -m 644 build/lib/$jar $RPM_BUILD_ROOT%{_javadir}/$vjar
-	ln -fs $vjar $RPM_BUILD_ROOT%{_javadir}$jar
-done
+cp -a build/lib/qname.jar $RPM_BUILD_ROOT%{_javadir}/qname-%{version}.jar
+cp -a build/lib/wsdl4j.jar $RPM_BUILD_ROOT%{_javadir}/wsdl4j-%{version}.jar
+ln -s qname-%{version} $RPM_BUILD_ROOT%{_javadir}/qname.jar
+ln -s wsdl4j-%{version} $RPM_BUILD_ROOT%{_javadir}/wsdl4j.jar
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-	rm -f %{_javadocdir}/%{name}
-fi
+ln -sf %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
 %doc license.html
-%{_javadir}/*
+%{_javadir}/*.jar
 
 %files javadoc
 %defattr(644,root,root,755)
@@ -95,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2007/04/17 22:21:01  glen
+-  unify java package; builds now
+
 Revision 1.5  2007/02/12 22:09:21  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wsdl4j.spec?r1=1.5&r2=1.6&f=u