SPECS: xerces-j.spec - unified, use macros (still doesn't build), ...

[radek]

Author: radek                        Date: Tue May 23 18:19:03 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified, use macros (still doesn't build), cosmetics
- License: Apache 1.1, removed LICENSE

---- Files affected:
SPECS:
   xerces-j.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/xerces-j.spec
diff -u SPECS/xerces-j.spec:1.24 SPECS/xerces-j.spec:1.25
--- SPECS/xerces-j.spec:1.24	Fri May 19 13:28:19 2006
+++ SPECS/xerces-j.spec	Tue May 23 20:18:58 2006
@@ -1,10 +1,11 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	XML parser for Java
 Summary(pl):	Analizator składniowy XML-a napisany w Javie
 Name:		xerces-j
 Version:	2.6.2
 Release:	1
-License:	Apache
+License:	Apache v1.1
 Group:		Applications/Publishing/XML/Java
 Source0:	http://www.apache.org/dist/xml/xerces-j/Xerces-J-src.%{version}.tar.gz
 # Source0-md5:	cfd536b8d72f8ebe3465ae35f5e3775d
@@ -21,8 +22,6 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javalibdir	%{_datadir}/java
-
 %description
 XML parser for Java.
 
@@ -44,27 +43,29 @@
 %setup -q -n xerces-%(echo %{version} | tr . _) -a1
 
 %build
-JAVA_HOME=%{_libdir}/java
-CLASSPATH=./tools/xercesImpl.jar
-CLASSPATH=./tools/bin/xjavac.jar:$CLASSPATH
-CLASSPATH=%{_javalibdir}/xml-commons-apis.jar:$CLASSPATH
-export JAVA_HOME CLASSPATH
-ant clean jars javadocs
+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}
+
+%{ant} clean jars javadocs
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javalibdir}
+install -d $RPM_BUILD_ROOT%{_javadir}
 
-install build/xerces*.jar $RPM_BUILD_ROOT%{_javalibdir}
-ln -sf xercesImpl.jar $RPM_BUILD_ROOT%{_javalibdir}/jaxp_parser_impl.jar
+install build/xerces*.jar $RPM_BUILD_ROOT%{_javadir}
+ln -sf  xercesImpl.jar    $RPM_BUILD_ROOT%{_javadir}/jaxp_parser_impl.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README Readme.html LICENSE STATUS
-%{_javalibdir}/*.jar
+%doc README Readme.html STATUS
+%{_javadir}/*.jar
 
 %files doc
 %defattr(644,root,root,755)
@@ -76,6 +77,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2006/05/23 18:18:58  radek
+- unified, use macros (still doesn't build), cosmetics
+- License: Apache 1.1, removed LICENSE
+
 Revision 1.24  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xerces-j.spec?r1=1.24&r2=1.25&f=u