SPECS: fop.spec - unified, use macros (still doesn't build) - s/_j...

[radek]

Author: radek                        Date: Tue May 23 18:45:12 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified, use macros (still doesn't build)
- s/_javaclassdir/_javadir
- license: apache v1.1, removed LICENSE

---- Files affected:
SPECS:
   fop.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: SPECS/fop.spec
diff -u SPECS/fop.spec:1.30 SPECS/fop.spec:1.31
--- SPECS/fop.spec:1.30	Mon Aug 16 12:48:28 2004
+++ SPECS/fop.spec	Tue May 23 20:45:07 2006
@@ -1,11 +1,12 @@
 # $Revision$, $Date$
+%include	/usr/lib/rpm/macros.java
 Summary:	XSL Formatter in Java
 Summary(pl):	Formater XSL napisany w Javie
 Name:		fop
 Version:	0.20.5
 Release:	1
 Vendor:		http://xml.apache.org/
-License:	Apache
+License:	Apache v1.1
 Group:		Applications/Publishing/XML/Java
 Source0:	http://www.apache.org/dist/xml/fop/source/%{name}-%{version}-src.tar.gz
 # Source0-md5:	1a31eb1357e5d4b8d32d4cb3edae2da2
@@ -24,7 +25,6 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javaclassdir		%{_libdir}/java
 %define		_fop_font_metrics	/var/lib/fop
 
 %description
@@ -47,14 +47,17 @@
 %setup -q
 
 %build
-JAVA_HOME=%{_libdir}/java
-export JAVA_HOME
+required_jars='tools ant xml-apis xercesImpl xalan'
+export CLASSPATH="$CLASSPATH:`/usr/bin/build-classpath $required_jars`"
+export JAVA_HOME=%{java_home}
+export JAVAC=%{javac}
+export JAVA=%{java}
 
-sh build.sh
+%{ant}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javaclassdir},%{_fop_font_metrics},%{_bindir}} \
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_fop_font_metrics},%{_bindir}} \
 	$RPM_BUILD_ROOT%{_fontsdir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/fop-font-install
@@ -63,7 +66,7 @@
 # create empty config file
 echo > $RPM_BUILD_ROOT%{_fontsdir}/fop-font.config
 
-install lib/avalon-framework-cvs-20020806.jar build/fop.jar $RPM_BUILD_ROOT%{_javaclassdir}
+install lib/avalon-framework-cvs-20020806.jar build/fop.jar $RPM_BUILD_ROOT%{_javadir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,10 +76,10 @@
 
 %files
 %defattr(644,root,root,755)
-%doc LICENSE README STATUS
+%doc CHANGES README STATUS
 %dir %{_fop_font_metrics}
 %attr(755,root,root) %{_bindir}/*
-%{_javaclassdir}/*
+%{_javadir}/*
 %{_fontsdir}/*.config
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -85,6 +88,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2006/05/23 18:45:07  radek
+- unified, use macros (still doesn't build)
+- s/_javaclassdir/_javadir
+- license: apache v1.1, removed LICENSE
+
 Revision 1.30  2004/08/16 10:48:28  luzik
  - updated to 0.20.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/fop.spec?r1=1.30&r2=1.31&f=u