- do not pull java-sun via BR - icedtea6 should be enough in all (most) cases

[packages/java-xmlgraphics-batik.git] / java-xmlgraphics-batik.spec

diff --git a/java-xmlgraphics-batik.spec b/java-xmlgraphics-batik.spec
index 83a6c6862fee24e44c49804d265bb059bd450a85..7e566806020e6890409c36c9477e6fbf75bbb21c 100644 (file)
--- a/java-xmlgraphics-batik.spec
+++ b/java-xmlgraphics-batik.spec
@@ -4,32 +4,35 @@
 # Conditional build:
 %bcond_with    doc             # build with docs (require apache-forrest)
 %bcond_with    bootstrap       # break BR loop batik-fop
-#
+
+%include       /usr/lib/rpm/macros.java
+
+%define                _rel    6
+%define                srcname xmlgraphics-batik
 Summary:       Java SVG support
 Summary(pl.UTF-8):     Wsparcie dla SVG dla języka Java
-Name:          batik
+Name:          java-xmlgraphics-batik
 Version:       1.7
-Release:       0.1
+Release:       %{_rel}%{?with_bootstrap:.bootstrap}
 License:       Apache
 Group:         Applications/Publishing/XML/Java
-Source0:       http://www.apache.org/dist/xmlgraphics/batik/%{name}-src-%{version}.zip
+Source0:       http://www.apache.org/dist/xmlgraphics/batik/batik-src-%{version}.zip
 # Source0-md5: c117ca2241907f62a2b3031167ebf917
 Patch0:                %{name}-nodocs.patch
 URL:           http://xml.apache.org/batik/
-%{!?with_bootstrap:BuildRequires:      fop}
 %{?with_doc:BuildRequires:     java-forrest}
-BuildRequires: java-xalan
 BuildRequires: jdk >= 1.4
+BuildRequires: java-xalan
+%{!?with_bootstrap:BuildRequires:      java-xmlgraphics-fop}
 BuildRequires: jpackage-utils
 BuildRequires: rhino
 BuildRequires: unzip
-BuildRequires: xalan-c
 BuildRequires: xml-commons-external
-Requires:      java-xalan
 Requires:      jre >= 1.4
+Requires:      java-xalan
 Requires:      rhino
-Requires:      xalan-c
 Requires:      xml-commons-external
+Obsoletes:     batik
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,7 +54,7 @@ Documentation for the Batik library.
 Dokumentacja dla biblioteki Batik.
 
 %prep
-%setup -q
+%setup -q -n batik-%{version}
 
 %if %{without doc}
 %patch0 -p0
@@ -64,13 +67,13 @@ unset CLASSPATH || :
 export JAVA_HOME=%{java_home}
 
 jars='js xalan xercesImpl xml-apis xml-apis-ext'
-for jar in jars; do
+for jar in $jars; do
        ln -s $(find-jar $jar) lib
 done
 
 %if %{without bootstrap}
        rm lib/pdf-transcoder.jar
-       ln -s $(find-jar fop-transcoder) lib
+       ln -s $(find-jar xmlgraphics-fop) lib
 %endif
 
 #sh build.sh dist-tgz # does not work :-(
@@ -78,33 +81,37 @@ sh build.sh dist-zip
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javadir}/%{name}/lib
+install -d $RPM_BUILD_ROOT%{_javadir}/%{srcname}
 
-cd %{name}-%{version}
+cd batik-%{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
+       install $jar $RPM_BUILD_ROOT%{_javadir}/xmlgraphics-$base-%{version}.jar
+       ln -s xmlgraphics-$base-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xmlgraphics-$base.jar
 done
 
 cd lib
 for jar in batik*.jar; do
-  install $jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$jar
+  install $jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}/$jar
 done
 
 %if %{with bootstrap}
-       install -p pdf-transcoder.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/pdf-transcoder.jar
+  install -p pdf-transcoder.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}/pdf-transcoder.jar
 %endif
 
+cd ../extensions
+for jar in batik*.jar; do
+  install $jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}/extension-${jar#batik-}
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc CHANGES KEYS NOTICE README
-# ??? WTF dir for .jar?
-%dir %{_javadir}/batik*.jar
-%{_javadir}/%{name}
+%{_javadir}/%{srcname}*.jar
+%{_javadir}/%{srcname}
 
 %if %{with doc}
 %files doc