[batik] Move to Batik 1.7 manifests.

[Alexander Kurtakov]

commit 9b0dbf90cd6084d819d5700bf2e367372e85c07b
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Sun Feb 23 10:44:31 2014 +0200

    Move to Batik 1.7 manifests.
    
    - Remove old stuff.

 batik-1.6-nosmilInDOMSVGManifest.patch |   12 ---------
 batik-1.7-nosmilInDOMSVGManifest.patch |    9 -------
 batik-sun-codecs.patch                 |   13 ----------
 batik.spec                             |   39 +++++++++++--------------------
 sources                                |    1 -
 5 files changed, 14 insertions(+), 60 deletions(-)
---
diff --git a/batik.spec b/batik.spec
index 2ad5da7..8b892d8 100644
--- a/batik.spec
+++ b/batik.spec
@@ -1,6 +1,6 @@
 Name:           batik
 Version:        1.8
-Release:        0.11.svn1230816%{?dist}
+Release:        0.12.svn1230816%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0 and W3C
 URL:            http://xml.apache.org/batik/
@@ -24,30 +24,23 @@ Source7:        %{name}-repack.sh
 # Then manually remove all lines containing MD5sums/crypto hashes.
 # tar czf batik-1.6-orbit-manifests.tar.gz *.MF
 #
-# FIXME:  move to 1.7 manifests
-Source8:        %{name}-1.6-orbit-manifests.tar.gz
+Source8:        %{name}-1.7-orbit-manifests.tar.gz
 
 
 Patch0:         %{name}-manifests.patch
 Patch1:         %{name}-policy.patch
 # remove dependency on bundled rhino from pom
-Patch2:		%{name}-script-remove-js.patch
-# SMIL in Fedora has been merged into xml-commons-apis-ext like it has
-# been upstream.  It's easier to take the OSGi manifests from Orbit
-# directly and patch this one.
-#
-# FIXME:  move to 1.7 manifest from Eclipse Orbit project
-Patch3:         %{name}-1.6-nosmilInDOMSVGManifest.patch
+Patch2:         %{name}-script-remove-js.patch
 
 # make sure we fail build if javadocs fail (run OOM)
 # also make maxmem a bit higher. we seem to need more...
 # https://issues.apache.org/jira/browse/BATIK-1065
-Patch4:         %{name}-javadoc-task-failonerror-and-oom.patch
+Patch3:         %{name}-javadoc-task-failonerror-and-oom.patch
 
 BuildArch:      noarch
 
 BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils >= 1.5
+BuildRequires:  javapackages-tools >= 1.5
 BuildRequires:  ant
 BuildRequires:  subversion
 BuildRequires:  zip
@@ -59,12 +52,11 @@ BuildRequires:  xalan-j2
 BuildRequires:  xml-commons-apis >= 1.3.04
 
 BuildRequires:  java-javadoc >= 1:1.6.0
-BuildRequires:  rhino-javadoc
 
 Requires:       java >= 1:1.6.0
-Requires:       jpackage-utils
+Requires:       javapackages-tools
 #full support for tiff
-Requires:	jai-imageio-core
+Requires:       jai-imageio-core
 Requires:       rhino >= 1.5
 Requires:       xalan-j2
 Requires:       xml-commons-apis >= 1.3.04
@@ -156,7 +148,6 @@ rm -f `find -name properties`
 mkdir orbit
 pushd orbit
 tar xzf %{SOURCE8}
-%patch3
 popd
 
 # create poms from templates
@@ -164,11 +155,11 @@ for module in anim awt-util bridge codec css dom ext extension gui-util \
               gvt parser script svg-dom svggen swing transcoder util xml \
               rasterizer slideshow squiggle svgpp ttf2svg; do
       sed "s:@version@:%{version}:g" sources/%{name}-$module.pom.template \
-      	  > %{name}-$module.pom
+         > %{name}-$module.pom
 done
 %patch2
 
-%patch4
+%patch3
 
 %build
 export CLASSPATH=$(build-classpath xml-commons-apis xml-commons-apis-ext js rhino xalan-j2 xalan-j2-serializer xerces-j2)
@@ -182,9 +173,6 @@ ant all-jar jars\
         rasterizer-jar \
         ttf2svg-jar
 
-for j in $(find batik-%{version} -name *.jar); do
- export CLASSPATH=$CLASSPATH:${j}
-done
 ant javadoc
 
 
@@ -267,9 +255,6 @@ for module in anim awt-util bridge codec css dom ext extension gui-util \
       %add_maven_depmap JPP.%{name}-%{name}-$module.pom %{name}/%{name}-$module.jar -a "%{name}:%{name}-$module"
 done
 
-
-
-
 # scripts
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/squiggle
@@ -323,6 +308,10 @@ chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh
 
 
 %changelog
+* Sun Feb 23 2014 Alexander Kurtakov <akurtako at redhat.com> 1.8-0.12.svn1230816
+- Move to Batik 1.7 manifests.
+- Remove old stuff.
+
 * Thu Jan 16 2014 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.8-0.11.svn1230816
 - Fix classpath for slideshow script
 - Change javadoc task maxmem to 512MB to avoid OOM
@@ -527,7 +516,7 @@ chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh
 * Sat Nov 17 2001 Christian Zoffoli <czoffoli at littlepenguin.org> 1.1-0.rc3.2jpp
 - added batik-libs creation
 
-* Thu Nov 9 2001 Christian Zoffoli <czoffoli at littlepenguin.org> 1.1-0.rc3.1jpp
+* Fri Nov 9 2001 Christian Zoffoli <czoffoli at littlepenguin.org> 1.1-0.rc3.1jpp
 - changed version to 0.rc3.1
 
 * Mon Nov 5 2001 Christian Zoffoli <czoffoli at littlepenguin.org> 1.1rc3-1jpp
diff --git a/sources b/sources
index 69276bd..8732784 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 22b0950a3981da350816d19f39b29158  batik-repack-1.8.zip
-dd117ec24522ed3f06ff2c280333132e  batik-1.6-orbit-manifests.tar.gz
 a1c9c666cbf529958cc567f44bd76abb  batik-1.7-orbit-manifests.tar.gz