updated to 1.8pre, solving removed codec packages from openjdk7

2012-02-21 11:32:36 +01:00 · 2012-02-21 11:32:36 +01:00 · 44436b8cbc
commit 44436b8cbc
parent 01b2809715
7 changed files with 70 additions and 56 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,5 @@ batik-repack-1.7.zip
 batik-orbit-manifests.tar.gz
 batik-1.6-orbit-manifests.tar.gz
 batik-1.7-orbit-manifests.tar.gz
+/batik-repack-1.8pre.zip
+/batik-repack-1.8.zip
--- a/batik-manifests.patch
+++ b/batik-manifests.patch
@ -1,14 +1,14 @@
-diff -ruN batik-1.7.old/sources/batik-browser-ext.mf batik-1.7/sources/batik-browser-ext.mf
--- batik-1.7.old/sources/batik-browser-ext.mf	2007-03-26 11:53:18.000000000 -0400
-+++ batik-1.7/sources/batik-browser-ext.mf	2007-11-23 12:30:47.000000000 -0500
+diff -ruN batik-1.8.old/sources/batik-browser-ext.mf batik-1.8/sources/batik-browser-ext.mf
+--- batik-1.8.old/sources/batik-browser-ext.mf	2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-browser-ext.mf	2007-11-23 12:30:47.000000000 -0500
@@ -1,4 +1,2 @@
 Manifest-Version: 1.0
 -Class-Path: ../batik-squiggle.jar \
 -            ../lib/batik-extension.jar
 Main-Class: org.apache.batik.apps.svgbrowser.Main
-diff -ruN batik-1.7.old/sources/batik-browser.mf batik-1.7/sources/batik-browser.mf
--- batik-1.7.old/sources/batik-browser.mf	2007-03-26 11:53:18.000000000 -0400
-+++ batik-1.7/sources/batik-browser.mf	2007-11-23 12:30:03.000000000 -0500
+diff -ruN batik-1.8.old/sources/batik-browser.mf batik-1.8/sources/batik-browser.mf
+--- batik-1.8.old/sources/batik-browser.mf	2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-browser.mf	2007-11-23 12:30:03.000000000 -0500
@@ -1,23 +1,2 @@
 Manifest-Version: 1.0
 Main-Class: org.apache.batik.apps.svgbrowser.Main
@ -33,9 +33,9 @@ diff -ruN batik-1.7.old/sources/batik-browser.mf batik-1.7/sources/batik-browser
 -            lib/xml-apis.jar \
 -            lib/xml-apis-ext.jar \
 -            lib/js.jar
-diff -ruN batik-1.7.old/sources/batik.mf batik-1.7/sources/batik.mf
--- batik-1.7.old/sources/batik.mf	2007-03-26 11:53:18.000000000 -0400
-+++ batik-1.7/sources/batik.mf	2007-11-23 12:31:02.000000000 -0500
+diff -ruN batik-1.8.old/sources/batik.mf batik-1.8/sources/batik.mf
+--- batik-1.8.old/sources/batik.mf	2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik.mf	2007-11-23 12:31:02.000000000 -0500
@@ -1,29 +1,2 @@
 Manifest-Version: 1.0
 Main-Class: org.apache.batik.apps.svgbrowser.Main
@ -66,9 +66,9 @@ diff -ruN batik-1.7.old/sources/batik.mf batik-1.7/sources/batik.mf
 -            lib/xml-apis-ext.jar \
 -            lib/pdf-transcoder.jar \
 -            lib/js.jar
-diff -ruN batik-1.7.old/sources/batik-pp.mf batik-1.7/sources/batik-pp.mf
--- batik-1.7.old/sources/batik-pp.mf	2007-03-26 11:53:18.000000000 -0400
-+++ batik-1.7/sources/batik-pp.mf	2007-11-23 12:30:39.000000000 -0500
+diff -ruN batik-1.8.old/sources/batik-pp.mf batik-1.8/sources/batik-pp.mf
+--- batik-1.8.old/sources/batik-pp.mf	2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-pp.mf	2007-11-23 12:30:39.000000000 -0500
@@ -1,10 +1,2 @@
 Manifest-Version: 1.0
 Main-Class: org.apache.batik.apps.svgpp.Main
@ -80,17 +80,17 @@ diff -ruN batik-1.7.old/sources/batik-pp.mf batik-1.7/sources/batik-pp.mf
 -            lib/batik-xml.jar \
 -            lib/xml-apis.jar \
 -            lib/xml-apis-ext.jar
-diff -ruN batik-1.7.old/sources/batik-rasterizer-ext.mf batik-1.7/sources/batik-rasterizer-ext.mf
--- batik-1.7.old/sources/batik-rasterizer-ext.mf	2007-03-26 11:53:18.000000000 -0400
-+++ batik-1.7/sources/batik-rasterizer-ext.mf	2007-11-23 12:30:54.000000000 -0500
+diff -ruN batik-1.8.old/sources/batik-rasterizer-ext.mf batik-1.8/sources/batik-rasterizer-ext.mf
+--- batik-1.8.old/sources/batik-rasterizer-ext.mf	2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-rasterizer-ext.mf	2007-11-23 12:30:54.000000000 -0500
@@ -1,4 +1,2 @@
 Manifest-Version: 1.0
 -Class-Path: ../batik-rasterizer.jar \
 -            ../lib/batik-extension.jar
 Main-Class: org.apache.batik.apps.rasterizer.Main
-diff -ruN batik-1.7.old/sources/batik-rasterizer.mf batik-1.7/sources/batik-rasterizer.mf
--- batik-1.7.old/sources/batik-rasterizer.mf	2007-03-26 11:53:18.000000000 -0400
-+++ batik-1.7/sources/batik-rasterizer.mf	2007-11-23 12:30:20.000000000 -0500
+diff -ruN batik-1.8.old/sources/batik-rasterizer.mf batik-1.8/sources/batik-rasterizer.mf
+--- batik-1.8.old/sources/batik-rasterizer.mf	2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-rasterizer.mf	2007-11-23 12:30:20.000000000 -0500
@@ -1,22 +1,2 @@
 Manifest-Version: 1.0
 Main-Class: org.apache.batik.apps.rasterizer.Main
@ -114,9 +114,9 @@ diff -ruN batik-1.7.old/sources/batik-rasterizer.mf batik-1.7/sources/batik-rast
 -            lib/xml-apis-ext.jar \
 -            lib/pdf-transcoder.jar \
 -            lib/js.jar
-diff -ruN batik-1.7.old/sources/batik-slideshow.mf batik-1.7/sources/batik-slideshow.mf
--- batik-1.7.old/sources/batik-slideshow.mf	2007-03-26 11:53:18.000000000 -0400
-+++ batik-1.7/sources/batik-slideshow.mf	2007-11-23 12:30:31.000000000 -0500
+diff -ruN batik-1.8.old/sources/batik-slideshow.mf batik-1.8/sources/batik-slideshow.mf
+--- batik-1.8.old/sources/batik-slideshow.mf	2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-slideshow.mf	2007-11-23 12:30:31.000000000 -0500
@@ -1,23 +1,2 @@
 Manifest-Version: 1.0
 Main-Class: org.apache.batik.apps.slideshow.Main
@ -141,9 +141,9 @@ diff -ruN batik-1.7.old/sources/batik-slideshow.mf batik-1.7/sources/batik-slide
 -            lib/xml-apis.jar \
 -            lib/xml-apis-ext.jar \
 -            lib/js.jar
-diff -ruN batik-1.7.old/sources/batik-ttf2svg.mf batik-1.7/sources/batik-ttf2svg.mf
--- batik-1.7.old/sources/batik-ttf2svg.mf	2007-03-26 11:53:18.000000000 -0400
-+++ batik-1.7/sources/batik-ttf2svg.mf	2007-11-23 12:30:11.000000000 -0500
+diff -ruN batik-1.8.old/sources/batik-ttf2svg.mf batik-1.8/sources/batik-ttf2svg.mf
+--- batik-1.8.old/sources/batik-ttf2svg.mf	2007-03-26 11:53:18.000000000 -0400
+++ batik-1.8/sources/batik-ttf2svg.mf	2007-11-23 12:30:11.000000000 -0500
@@ -1,4 +1,2 @@
 Manifest-Version: 1.0
 Main-Class: org.apache.batik.apps.ttf2svg.Main
--- a/batik-policy.patch
+++ b/batik-policy.patch
@ -1,6 +1,6 @@
-diff -uNr batik-1.7-clean/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy batik-1.7/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy
--- batik-1.7-clean/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy	2007-09-07 14:05:13.000000000 -0400
-+++ batik-1.7/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy	2007-09-12 13:36:24.000000000 -0400
+diff -uNr batik-1.8-clean/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy batik-1.8/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy
+--- batik-1.8-clean/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy	2007-09-07 14:05:13.000000000 -0400
+++ batik-1.8/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy	2007-09-12 13:36:24.000000000 -0400
@@ -30,6 +30,11 @@
   permission java.security.AllPermission;
 };
@ -13,9 +13,9 @@ diff -uNr batik-1.7-clean/resources/org/apache/batik/apps/rasterizer/resources/r
 grant codeBase "${app.jar.base}/lib/batik-ext.jar" {
   permission java.security.AllPermission;
 };
-diff -uNr batik-1.7-clean/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy batik-1.7/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy
--- batik-1.7-clean/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy	2007-09-07 14:05:13.000000000 -0400
-+++ batik-1.7/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy	2007-09-12 13:36:49.000000000 -0400
+diff -uNr batik-1.8-clean/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy batik-1.8/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy
+--- batik-1.8-clean/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy	2007-09-07 14:05:13.000000000 -0400
+++ batik-1.8/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy	2007-09-12 13:36:49.000000000 -0400
@@ -34,6 +34,10 @@
   permission java.security.AllPermission;
 };
--- a/batik-repack.sh
+++ b/batik-repack.sh
@ -12,7 +12,7 @@ cleanup() {

 unset CDPATH
 pwd=$(pwd)
-ver=1.7
+ver=1.8pre

 cd "$tmp"
 unzip -qq "$pwd"/batik-src-$ver.zip
--- a/batik-script-remove-js.patch
+++ b/batik-script-remove-js.patch
@ -1,12 +1,12 @@
 --- batik-script.pom	2011-05-03 12:57:35.428208738 +0200
 +++ batik-script.pom.new	2011-05-03 13:08:54.565452184 +0200
@@ -98,11 +98,6 @@
-       <version>1.7</version>
+       <version>1.8</version>
     </dependency>
     <dependency>
 -      <groupId>org.apache.xmlgraphics</groupId>
 -      <artifactId>batik-js</artifactId>
-      <version>1.7</version>
+-      <version>1.8</version>
 -    </dependency>
 -    <dependency>
       <groupId>xml-apis</groupId>
--- a/batik.spec
+++ b/batik.spec
@ -1,6 +1,6 @@
 Name:           batik
-Version:        1.7
-Release:        13%{?dist}
+Version:        1.8
+Release:        0.1.svn1230816%{?dist}
 Summary:        Scalable Vector Graphics for Java
 License:        ASL 2.0
 URL:            http://xml.apache.org/batik/
@ -14,6 +14,9 @@ Source4:        %{name}.rasterizer.script
 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/
 #
@ -57,6 +60,8 @@ BuildRequires:  java-javadoc >= 1:1.6.0
 BuildRequires:  rhino-javadoc

 Requires:       java >= 1:1.6.0
+#full support for tiff
+Requires:	jai-imageio-core
 Requires:       rhino >= 1.5
 Requires:       xalan-j2
 Requires:       xml-commons-apis >= 1.3.04
@ -190,49 +195,49 @@ 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}-%{version}/lib/batik-bridge.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-bridge.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-css-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{version}/lib/batik-css.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-css.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-dom-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{version}/lib/batik-dom.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-dom.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}-%{version}/lib/batik-svg-dom.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-svg-dom.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}-%{version}/lib/batik-awt-util.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-awt-util.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-extension-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{version}/lib/batik-extension.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-extension.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-parser-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{version}/lib/batik-parser.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-parser.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-svggen-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{version}/lib/batik-svggen.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-svggen.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-swing-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{version}/lib/batik-swing.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-swing.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-transcoder-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{version}/lib/batik-transcoder.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-transcoder.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}-%{version}/lib/batik-gui-util.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-gui-util.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-util-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{version}/lib/batik-util.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-util.jar META-INF/MANIFEST.MF
 cp -p orbit/batik-xml-MANIFEST.MF META-INF/MANIFEST.MF
 touch META-INF/MANIFEST.MF
-zip -u %{name}-%{version}/lib/batik-xml.jar META-INF/MANIFEST.MF
+zip -u %{name}-%{inner_version}/lib/batik-xml.jar META-INF/MANIFEST.MF


 # jars
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
-pushd %{name}-%{version}/lib
+pushd %{name}-%{inner_version}/lib
 for jarname in $(find batik-*.jar); do
    cp -p ${jarname} $RPM_BUILD_ROOT%{_javadir}/%{name}/
 done
@ -242,11 +247,11 @@ cp -p %{name}-all.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-all.jar

 popd

-cp -p %{name}-%{version}/batik-rasterizer.jar \
-        %{name}-%{version}/%{name}-slideshow.jar \
-        %{name}-%{version}/%{name}-squiggle.jar \
-        %{name}-%{version}/%{name}-svgpp.jar \
-        %{name}-%{version}/%{name}-ttf2svg.jar \
+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}

 # poms and depmaps for subpackages are different (no batik subdir)
@ -282,7 +287,7 @@ cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/slideshow

 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr %{name}-%{version}/docs/* \
+cp -pr %{name}-%{inner_version}/docs/* \
  $RPM_BUILD_ROOT%{_javadocdir}/%{name}

 # demo
@ -381,6 +386,13 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :


 %changelog
+* Mon Feb 20 2012 Jiri Vanek <jvanek@redhat.com> 1.7-14
+- Solving jdk7's  removed internal (since 1.4.2 deprecated) com.sun.image.codec package
+- Gripped new sources from 1.8pre trunk which have support adapters for removed classes,
+- Removed all old an unused tiff classes from it -  org.apache.batik.ext.awt.image.code.tiff
+- Added requires JAI which provides tiff support
+- Added inner_version variable, which helps to keep 1.8 outside and 1.8pre inside
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

--- a/2
+++ b/2
@ -1,3 +1,3 @@
-207f23ed2d90e9b9982f739398834c4d  batik-repack-1.7.zip
+22b0950a3981da350816d19f39b29158  batik-repack-1.8.zip
 dd117ec24522ed3f06ff2c280333132e  batik-1.6-orbit-manifests.tar.gz
 a1c9c666cbf529958cc567f44bd76abb  batik-1.7-orbit-manifests.tar.gz