From d21f8e593572cc68c88eccc2e475562f6b79ffff Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: May 21 2015 07:20:59 +0000
Subject: Update to 1.8 final.


---

diff --git a/.gitignore b/.gitignore
index 1b9711a..5f6c5ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ batik-1.6-orbit-manifests.tar.gz
 batik-1.7-orbit-manifests.tar.gz
 /batik-repack-1.8pre.zip
 /batik-repack-1.8.zip
+/batik-src-1.8.zip
diff --git a/batik.spec b/batik.spec
index ee23abd..4f30c90 100644
--- a/batik.spec
+++ b/batik.spec
@@ -1,11 +1,10 @@
 Name:           batik
 Version:        1.8
-Release:        0.18.svn1230816%{?dist}
+Release:        1%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0 and W3C
 URL:            http://xml.apache.org/batik/
-#Source0:        http://apache.crihan.fr/dist/xmlgraphics/batik/batik-src-%%{version}.zip
-Source0:        %{name}-repack-%{version}.zip
+Source0:        http://apache.crihan.fr/dist/xmlgraphics/batik/source/batik-src-%{version}.zip
 Source1:        %{name}.squiggle.script
 Source2:        %{name}.svgpp.script
 Source3:        %{name}.ttf2svg.script
@@ -14,8 +13,6 @@ Source5:        %{name}.slideshow.script
 Source6:        %{name}-squiggle.desktop
 Source7:        %{name}-repack.sh
 
-%global inner_version 1.8pre
-
 # These manifests with OSGi metadata are taken from the Eclipse Orbit
 # project:  http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/
 #
@@ -52,6 +49,7 @@ BuildRequires:  jpackage-utils >= 1.5
 BuildRequires:  xerces-j2
 BuildRequires:  xalan-j2
 BuildRequires:  xml-commons-apis >= 1.3.04
+BuildRequires:  xmlgraphics-commons
 
 BuildRequires:  java-javadoc >= 1:1.6.0
 
@@ -151,7 +149,7 @@ Demonstrations and samples for %{name}.
 find -name '*.class' -exec rm -f '{}' \;
 find -name '*.jar' -exec rm -f '{}' \;
 
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
 rm -f `find -name readOnly.png`
 rm -f `find -name properties`
@@ -167,13 +165,15 @@ for module in anim awt-util bridge codec css dom ext extension gui-util \
       sed "s:@version@:%{version}:g" sources/%{name}-$module.pom.template \
          > %{name}-$module.pom
 done
-%patch2
+#%patch2
 
-%patch3
+#%patch3
 %patch4
 
+rm -fr sources/org/apache/batik/ext/awt/image/codec/tiff
+
 %build
-export CLASSPATH=$(build-classpath xml-commons-apis xml-commons-apis-ext js rhino xalan-j2 xalan-j2-serializer xerces-j2)
+export CLASSPATH=$(build-classpath xml-commons-apis xml-commons-apis-ext xmlgraphics-commons js rhino xalan-j2 xalan-j2-serializer xerces-j2)
 ant all-jar jars\
         -Ddebug=on \
         -Dsun-codecs.present=false \
@@ -192,64 +192,63 @@ ant javadoc
 mkdir -p META-INF
 cp -p orbit/batik-bridge-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-bridge.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-bridge-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-css-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-css.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-css-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-dom-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-dom.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-dom-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-dom-svg-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-svg-dom.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-svg-dom-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-ext-awt-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-awt-util.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-awt-util-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-extension-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-extension.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-extension-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-parser-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-parser.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-parser-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-svggen-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-svggen.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-svggen-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-swing-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-swing.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-swing-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-transcoder-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-transcoder.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-transcoder-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-util-gui-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-gui-util.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-gui-util-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-util-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-util.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-util-%{version}.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-xml-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{inner_version}/lib/batik-xml.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{version}/lib/batik-xml-%{version}.jar META-INF/MANIFEST.MF
 
 
 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
-pushd %{name}-%{inner_version}/lib
+pushd %{name}-%{version}/lib
 for jarname in $(find batik-*.jar); do
-    cp -p ${jarname} $RPM_BUILD_ROOT%{_javadir}/%{name}/
+    cp -p ${jarname} $RPM_BUILD_ROOT%{_javadir}/%{name}/${jarname//-1.8/}
 done
 
 rm -fr $RPM_BUILD_ROOT%{_javadir}/%{name}/%{name}-all.jar
-cp -p %{name}-all.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-all.jar
+cp -p %{name}-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-all.jar
 
 popd
 
-cp -p %{name}-%{inner_version}/batik-rasterizer.jar \
-        %{name}-%{inner_version}/%{name}-slideshow.jar \
-        %{name}-%{inner_version}/%{name}-squiggle.jar \
-        %{name}-%{inner_version}/%{name}-svgpp.jar \
-        %{name}-%{inner_version}/%{name}-ttf2svg.jar \
-        $RPM_BUILD_ROOT%{_javadir}
+pushd %{name}-%{version}
+for module in rasterizer slideshow squiggle svgpp ttf2svg; do
+	cp -p batik-$module-%{version}.jar  $RPM_BUILD_ROOT%{_javadir}/batik-$module.jar
+done
+popd
 
 # poms and depmaps for subpackages are different (no batik subdir)
 install -d -m 755 $RPM_BUILD_ROOT/%{_mavenpomdir}
@@ -282,7 +281,7 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/slideshow
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr %{name}-%{inner_version}/docs/* \
+cp -pr %{name}-%{version}/docs/* \
   $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # demo
@@ -327,6 +326,9 @@ chmod +x $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib/charts/convert.sh
 
 
 %changelog
+* Thu May 21 2015 Alexander Kurtakov <akurtako@redhat.com> 1.8-1
+- Update to 1.8 final.
+
 * Wed May 13 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-0.18.svn1230816
 - Disable javadoc doclint
 
diff --git a/sources b/sources
index 3e83888..a8bc4ed 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-22b0950a3981da350816d19f39b29158  batik-repack-1.8.zip
 fdbb12c86065228a7f887adb4964c74e  batik-1.7-orbit-manifests.tar.gz
+6e65afa4ab4d99796716f89f579a2d64  batik-src-1.8.zip