SPECS: xalan-j.spec - release 2: separated doc subpackage, use mac...

[radek]

Author: radek                        Date: Tue May 23 18:00:25 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- release 2: separated doc subpackage, use macros; builds now
- License: apache v2, removed LICENSE file
- added NOTICE file, cosmetics

---- Files affected:
SPECS:
   xalan-j.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/xalan-j.spec
diff -u SPECS/xalan-j.spec:1.19 SPECS/xalan-j.spec:1.20
--- SPECS/xalan-j.spec:1.19	Fri May 19 13:28:19 2006
+++ SPECS/xalan-j.spec	Tue May 23 20:00:18 2006
@@ -1,13 +1,15 @@
 # $Revision$, $Date$
-%define		ver	2.6.0
-%define		_ver	%(echo %{ver} | tr . _)
-
+#
+# TODO: without_docs bcond; generating takes ages
+#
+%include	/usr/lib/rpm/macros.java
 Summary:	XSLT processor for Java
 Summary(pl):	Procesor XSLT napisany w Javie
 Name:		xalan-j
-Version:	%{ver}
-Release:	1
-License:	Apache/W3C
+Version:	2.6.0
+%define	_ver	%(echo %{version} | tr . _)
+Release:	2
+License:	Apache License v2.0
 Group:		Applications/Publishing/XML/Java
 Source0:	http://www.apache.org/dist/xml/xalan-j/source/%{name}_%{_ver}-src.tar.gz
 # Source0-md5:	a210f7108e680ab60a11977ec99ab1f9
@@ -35,6 +37,16 @@
 %description -l pl
 Procesor XSLT napisany w Javie.
 
+%package doc
+Summary:	Documentation for xalan-j, an XSLT processor for Java
+Group:		Documentation
+
+%description doc
+Documentation for xalan-j, an XSLT processor for Java.
+
+%description doc -l pl
+Dokumentacja dla xalan-j, procesora XSLT napisanego w Javie.
+
 %prep
 %setup -q -n xalan-j_%{_ver}
 %patch0 -p1
@@ -42,35 +54,40 @@
 find . -name "*.jar" ! -name "xalan2jdoc.jar" ! -name "stylebook-1.0-b3_xalan-2.jar" -exec rm -f {} \;
 
 %build
-JAVA_HOME=%{_libdir}/java
-CLASSPATH=%{_javadir}/servlet.jar
-CLASSPATH=$CLASSPATH:%{_javadir}/java_cup.jar
-CLASSPATH=$CLASSPATH:%{_javadir}/java_cup-runtime.jar
-CLASSPATH=$CLASSPATH:%{_javadir}/jlex.jar
-CLASSPATH=$CLASSPATH:%{_javadir}/bcel.jar
-export JAVA_HOME CLASSPATH
+required_jars='servlet java_cup java_cup-runtime jlex bcel jaxp_parser_impl'
+export CLASSPATH="`/usr/bin/build-classpath $required_jars`"
+export JAVA_HOME=%{java_home}
+export JAVAC=%{javac}
+export JAVA=%{java}
 
 ln -sf %{_javadir}/bcel.jar bin/BCEL.jar
 ln -sf %{_javadir}/regexp.jar bin/regexp.jar
 ln -sf %{_javadir}/java_cup-runtime.jar bin/runtime.jar
-ant xsltc.unbundledjar docs xsltc.docs javadocs samples servlet
+%{ant} xsltc.unbundledjar docs xsltc.docs javadocs samples servlet
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_examplesdir}}
 
 install build/{xalan,xsltc}.jar $RPM_BUILD_ROOT%{_javadir}
 ln -sf xalan.jar $RPM_BUILD_ROOT%{_javadir}/xalan-%{version}.jar
 ln -sf xalan.jar $RPM_BUILD_ROOT%{_javadir}/jaxp_transform_impl.jar
 ln -sf xsltc.jar $RPM_BUILD_ROOT%{_javadir}/xsltc-%{version}.jar
 
+cp -r samples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE build/docs/*
 %{_javadir}/*.jar
+%doc NOTICE
+
+%files doc
+%defattr(644,root,root,755)
+%doc build/docs/*
+%{_examplesdir}/%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -78,6 +95,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2006/05/23 18:00:18  radek
+- release 2: separated doc subpackage, use macros; builds now
+- License: apache v2, removed LICENSE file
+- added NOTICE file, cosmetics
+
 Revision 1.19  2006/05/19 11:28:19  jajcus
 - s/jakarta-ant/ant/ in BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xalan-j.spec?r1=1.19&r2=1.20&f=u