SPECS: xerces-j.spec - add -javaprov - provide xerces-j2.jar for j...

[glen]

Author: glen                         Date: Sun Dec  2 22:18:35 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add -javaprov
- provide xerces-j2.jar for jpackage compat

---- Files affected:
SPECS:
   xerces-j.spec (1.33 -> 1.34) 

---- Diffs:

================================================================
Index: SPECS/xerces-j.spec
diff -u SPECS/xerces-j.spec:1.33 SPECS/xerces-j.spec:1.34
--- SPECS/xerces-j.spec:1.33	Wed Sep  5 15:41:43 2007
+++ SPECS/xerces-j.spec	Sun Dec  2 23:18:30 2007
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	XML parser for Java
 Summary(pl.UTF-8):	Analizator składniowy XML-a napisany w Javie
 Name:		xerces-j
@@ -17,6 +18,7 @@
 BuildRequires:	ant >= 1.5
 BuildRequires:	jdk >= 1.1
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	xml-commons
 Requires:	jre >= 1.1
@@ -46,21 +48,17 @@
 %setup -q -n xerces-%(echo %{version} | tr . _) -a1
 
 %build
-CLASSPATH="./tools/xercesImpl.jar:./tools/bin/xjavac.jar"
 required_jars='xml-commons-apis'
-export CLASSPATH="$CLASSPATH:`/usr/bin/build-classpath $required_jars`"
-export JAVA_HOME=%{java_home}
-export JAVAC=%{javac}
-export JAVA=%{java}
+export CLASSPATH=$(build-classpath $required_jars):./tools/xercesImpl.jar:./tools/bin/xjavac.jar
 
 %ant clean jars javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-
-install build/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}
-ln -sf xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar
+cp -a build/xercesImpl.jar $RPM_BUILD_ROOT%{_javadir}/xerces-j2-%{version}.jar
+ln -sf xerces-j2-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar
+ln -sf xerces-j2-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xercesImpl.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +78,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.34  2007-12-02 22:18:30  glen
+- add -javaprov
+- provide xerces-j2.jar for jpackage compat
+
 Revision 1.33  2007-09-05 13:41:43  baggins
 - rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/xerces-j.spec?r1=1.33&r2=1.34&f=u