SPECS: batik.spec - up to 1.7 - use system jars (see TODO) - added TODO lin...

[pawelz]

Author: pawelz                       Date: Mon Dec 29 15:21:36 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 1.7
- use system jars (see TODO)
- added TODO line
- better %%files section

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

---- Diffs:

================================================================
Index: SPECS/batik.spec
diff -u SPECS/batik.spec:1.24 SPECS/batik.spec:1.25
--- SPECS/batik.spec:1.24	Mon Dec 29 02:17:48 2008
+++ SPECS/batik.spec	Mon Dec 29 16:21:30 2008
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 # TODO:
 # - generate docs without using forrest. It seems to be possible.
+# - do not use pdf-transcoder.jar from batik sources. See comments in %%prep
 #
 # Conditional build:
 %bcond_with	docs		# build with docs (require apache-forrest)
@@ -24,8 +25,6 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javaclassdir	%{_libdir}/java
-
 %description
 Java SVG support.
 
@@ -50,6 +49,19 @@
 %patch0 -p0
 %endif
 
+#
+# We do want to use system libs
+# problem:
+#   pdf-transcoder.jar is provided by fop, but this spec is BR for for. So we
+#   have to use pdf-transcoder.jar from batik sources.
+#
+
+br_jars='js xalan xercesImpl xml-apis xml-apis-ext'
+rm lib/js.jar lib/xalan*.jar lib/xerces*.jar lib/xml-apis*.jar
+for jar in $br_jars; do
+  ln -s $(find-jar $jar) lib
+done
+
 %build
 unset CLASSPATH || :
 export JAVA_HOME="%{java_home}"
@@ -59,21 +71,33 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javaclassdir}/%{name}/lib
+install -d $RPM_BUILD_ROOT%{_javadir}/%{name}/lib
 
-install %{name}-%{version}/lib/*.jar $RPM_BUILD_ROOT%{_javaclassdir}/%{name}/lib
-install %{name}-%{version}/*.jar $RPM_BUILD_ROOT%{_javaclassdir}/%{name}
+cd %{name}-%{version}
+for jar in batik*.jar; do
+  base=$(basename $jar .jar)
+  install $jar $RPM_BUILD_ROOT%{_javadir}/$base-%{version}.jar
+  ln -s $base-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$base.jar
+done
+
+cd lib
+for jar in batik*.jar; do
+  install $jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$jar
+done
+
+#
+# get rid of this jar!!! see TODO
+#
+install pdf-transcoder.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/pdf-transcoder.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc NOTICE README
-%dir %{_javaclassdir}/%{name}
-%{_javaclassdir}/%{name}/*.jar
-%dir %{_javaclassdir}/%{name}/lib
-%{_javaclassdir}/%{name}/lib/*.jar
+%doc CHANGES KEYS NOTICE README
+%dir %{_javadir}/batik*.jar
+%{_javadir}/%{name}
 
 %if %{with docs}
 %files doc
@@ -87,6 +111,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2008/12/29 15:21:30  pawelz
+- up to 1.7
+- use system jars (see TODO)
+- added TODO line
+- better %%files section
+
 Revision 1.24  2008/12/29 01:17:48  pawelz
 - TODO line about docs and forrest
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/batik.spec?r1=1.24&r2=1.25&f=u