OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-batik?expand=0&rev=36

2020-04-03 09:40:49 +00:00 · 2020-04-03 09:40:49 +00:00 · 06b1b5af30
commit 06b1b5af30
parent a913dad9be
15 changed files with 82 additions and 1165 deletions
--- a/batik-build.tar.xz
+++ b/batik-build.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2970d330a1aa891ea9d55f2b01eb76c620f5fec77e3618636e8a3dfc051644d3
+size 9104
--- a/batik-src-1.10.tar.gz
+++ b/batik-src-1.10.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dfc4e76951e3d80e32deb708ba70ad45899345a66ee7fa5f1315905477bfd116
-size 16760550
--- a/batik-src-1.12.tar.gz
+++ b/batik-src-1.12.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1236e7303e5880ed074222117ca70f0a0c2a249beac7f043a579de20aacc8bc
+size 17751312
--- a/xmlgraphics-batik-manifests.patch
+++ b/xmlgraphics-batik-manifests.patch
@ -1,716 +0,0 @@
--- batik-1.10/build.xml	2020-03-16 12:23:59.250010916 +0100
-+++ batik-1.10/build.xml	2020-03-16 13:18:00.196538358 +0100
-@@ -1016,9 +1016,11 @@
-                                awt-util-jar,
-                                gui-util-jar,
-                                dom-jar,
-+                               constants-jar,
-                                css-jar,
-                                svg-dom-jar,
-                                gvt-jar,
-+                               i18n-jar,
-                                parser-jar,
-                                script-jar,
-                                transcoder-jar,
-@@ -1029,8 +1031,10 @@
-                                extension-jar,
-                                xml-jar,
-                                root-jar,
-+                               svgbrowser-jar,
-                                svg-pp-jar,
-                                svggen-jar,
-+                               svgrasterizer-jar,
-                                svg-slideshow-jar,
-                                squiggle-jar,
-                                squiggle-ext-jar,
-@@ -1298,12 +1302,24 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik external code"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-ext"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.ext"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.w3c.dom;uses:=&quot;org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.w3c.dom.events;uses:=&quot;org.w3c.dom,org.w3c.dom.events,org.w3c.dom.views&quot;;version=&quot;${completeVersion}&quot;,org.w3c.dom.events;uses:=&quot;org.w3c.dom,org.w3c.dom.views&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.w3c.dom,org.w3c.dom.events,org.w3c.dom.views"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${lib}">
-         <include name="LICENSE.dom-*.txt"/>
-       </metainf>
-       <fileset dir="${dest}">
-         <include name="org/w3c/**"/>
-+        <include name="${package-prefix}/w3c/**"/>
-       </fileset>
-     </jar>
-   </target>
-@@ -1316,6 +1332,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik utility library"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-util"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.util"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.i18n;version=&quot;${completeVersion}&quot;,org.apache.batik.util;version=&quot;${completeVersion}&quot;;uses:=&quot;org.apache.batik.i18n,org.apache.batik.util.resources&quot;,org.apache.batik.util.resources;uses:=&quot;org.apache.batik.i18n&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.util.io;uses:=&quot;org.apache.batik.i18n&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.apache.batik,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.resources"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1341,6 +1368,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik AWT utilities"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-awt-util"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.awt-util"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.ext.swing;uses:=&quot;javax.swing,javax.swing.text,org.apache.batik.i18n,org.apache.batik.util.resources&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.geom;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.font;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image;uses:=&quot;org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.util&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image.spi;uses:=&quot;org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.util,org.apache.xmlgraphics.java2d.color&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image.renderable;uses:=&quot;org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.rendered,org.apache.xmlgraphics.java2d.color&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image.rendered;uses:=&quot;org.apache.batik.ext.awt.image,org.apache.batik.util,org.apache.xmlgraphics.java2d.color&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.g2d;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.color;uses:=&quot;org.apache.batik.util,org.apache.xmlgraphics.java2d.color&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="javax.swing,javax.swing.border,javax.swing.text,org.apache.batik.ext.awt,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.resources,org.apache.xmlgraphics.java2d.color"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1365,6 +1403,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik image codecs"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-codec"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.codec"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.ext.awt.image.codec.util;uses:=&quot;org.apache.batik.i18n&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image.codec.imageio;uses:=&quot;javax.imageio,javax.imageio.event,javax.imageio.metadata,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.spi,org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.util,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.ext.awt.image.codec.png;uses:=&quot;org.apache.batik.ext.awt.image.codec.util,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.ext.awt.image.spi,org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.util&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.jpeg,javax.imageio.stream,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.apache.batik.bridge,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.codec.util,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.ext.awt.image.spi,org.apache.batik.i18n,org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.util,org.w3c.dom"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1393,6 +1442,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik Java2D SVG generator"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-svggen"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.svggen"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.svggen;uses:=&quot;javax.swing,org.apache.batik.ext.awt.g2d,org.apache.batik.util,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.svggen.font;uses:=&quot;org.apache.batik.i18n,org.apache.batik.svggen.font.table,org.apache.batik.util&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.svggen.font.table;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="javax.swing,javax.swing.border,javax.swing.plaf,org.apache.batik.ext.awt.g2d,org.apache.batik.ext.awt.image.spi,org.apache.batik.i18n,org.apache.batik.svggen.font.table,org.apache.batik.util,org.w3c.dom"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1404,6 +1464,65 @@
-     </jar>
-   </target>
- 
-+  <target name="svgbrowser-jar" depends="init, compile, prepare-build">
-+    <jar jarfile="${build}/lib/${project}-svgbrowser-${completeVersion}.jar">
-+      <manifest>
-+        <attribute name="Implementation-Title" value="Batik SVG Browser Application Library"/>
-+        <attribute name="Implementation-Version" value="${completeVersion}"/>
-+        <attribute name="Implementation-Vendor" value="${vendor}"/>
-+        <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik SVG Browser Application Library"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-svgbrowser"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.svgbrowser"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.apps.svgbrowser;uses:=&quot;javax.swing,javax.swing.event,javax.swing.filechooser,javax.swing.table,javax.swing.tree,javax.xml.transform,org.apache.batik.bridge,org.apache.batik.ext.swing,org.apache.batik.gvt,org.apache.batik.i18n,org.apache.batik.swing,org.apache.batik.swing.gvt,org.apache.batik.swing.svg,org.apache.batik.util,org.apache.batik.util.gui,org.apache.batik.util.gui.resource,org.apache.batik.util.gui.xmleditor,org.apache.batik.util.resources,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="javax.swing,javax.swing.border,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.table,javax.swing.text,javax.swing.tree,javax.xml.parsers,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.stream,org.apache.batik,org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.bridge.svg12,org.apache.batik.dom,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.ext.swing,org.apache.batik.gvt,org.apache.batik.i18n,org.apache.batik.script,org.apache.batik.swing,org.apache.batik.swing.gvt,org.apache.batik.swing.svg,org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.transcoder.print,org.apache.batik.transcoder.svg2svg,org.apache.batik.util,org.apache.batik.util.gui,org.apache.batik.util.gui.resource,org.apache.batik.util.gui.xmleditor,org.apache.batik.util.resources,org.apache.batik.xml,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg,org.xml.sax"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-+      </manifest>
-+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-+      <fileset dir="${dest}">
-+        <include name="${package-prefix}/apps/svgbrowser/**/*.class"/>
-+      </fileset>
-+      <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
-+        <include name="${package-prefix}/apps/svgbrowser/resources/*"/>
-+        <include name="META-INF/services/org.apache.batik.apps.svgbrowser.SquiggleInputHandler"/>
-+      </fileset>
-+    </jar>
-+  </target>
-+
-+  <target name="svgrasterizer-jar" depends="init, compile, prepare-build">
-+    <jar jarfile="${build}/lib/${project}-svgrasterizer-${completeVersion}.jar">
-+      <manifest>
-+        <attribute name="Implementation-Title" value="Batik SVG Rasterizer Library"/>
-+        <attribute name="Implementation-Version" value="${completeVersion}"/>
-+        <attribute name="Implementation-Vendor" value="${vendor}"/>
-+        <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik SVG Rasterizer Library"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-svgrasterizer"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.svgrasterizer"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.apps.rasterizer;uses:=&quot;org.apache.batik.i18n,org.apache.batik.transcoder&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.transcoder,org.apache.batik.transcoder.image,org.apache.batik.util"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-+      </manifest>
-+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-+      <fileset dir="${dest}">
-+        <include name="${package-prefix}/apps/rasterizer/**/*.class"/>
-+      </fileset>
-+      <fileset dir="batik-svgrasterizer/src/main/resources" excludes="**/.svn/">
-+        <include name="${package-prefix}/apps/rasterizer/resources/*"/>
-+      </fileset>
-+    </jar>
-+  </target>
-+
-   <!-- SVGGraphics2D (dependencies: util, awt-util) -->
-   <target name="svggen-full-jar" depends="init, compile, prepare-build">
-     <jar jarfile="${build}/lib/${project}-svggenfull-${completeVersion}.jar">
-@@ -1436,6 +1555,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik GUI utilities"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-gui-util"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.util.gui"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.util.gui;uses:=&quot;javax.swing,javax.swing.event,javax.swing.filechooser,org.apache.batik.util.gui.resource,org.apache.batik.util.resources&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.util.gui.resource;uses:=&quot;javax.swing,org.apache.batik.util.resources&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.util.gui.xmleditor;uses:=&quot;javax.swing,javax.swing.text,javax.swing.undo&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="javax.swing,javax.swing.border,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.text,javax.swing.undo,org.apache.batik.util.gui.resource,org.apache.batik.util.resources,org.apache.batik.xml"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1456,6 +1586,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik DOM implementation"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-dom"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.dom"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.dom;uses:=&quot;javax.xml.transform,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.parser,org.apache.batik.dom.events,org.apache.batik.dom.traversal,org.apache.batik.dom.xbl,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.w3c.dom,org.apache.xml.utils,org.apache.xpath,org.apache.xpath.objects,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.w3c.dom.xpath&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.dom.util;uses:=&quot;org.apache.batik.util,org.apache.batik.xml,org.w3c.dom,org.w3c.dom.css,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.dom.events;uses:=&quot;org.apache.batik.dom,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.w3c.dom.events,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.smil,org.w3c.dom.views&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.dom.xbl;uses:=&quot;org.w3c.dom,org.w3c.dom.events&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.dom.traversal;uses:=&quot;org.apache.batik.dom,org.w3c.dom,org.w3c.dom.traversal&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="javax.xml.parsers,javax.xml.transform,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.parser,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.traversal,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.w3c.dom,org.apache.batik.w3c.dom.events,org.apache.batik.xml,org.apache.xml.utils,org.apache.xpath,org.apache.xpath.objects,org.w3c.css.sac,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.smil,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.w3c.dom.xpath,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1484,6 +1625,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik CSS engine"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-css"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.css"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.css.dom;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.svg,org.w3c.dom.views&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine.sac;uses:=&quot;org.w3c.css.sac,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine;uses:=&quot;org.apache.batik.css.engine.sac,org.apache.batik.css.engine.value,org.apache.batik.css.parser,org.apache.batik.i18n,org.apache.batik.util,org.w3c.css.sac,org.w3c.dom,org.w3c.dom.events&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine.value;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.i18n,org.apache.batik.util,org.w3c.css.sac,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine.value.css2;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.w3c.css.sac,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine.value.svg;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.w3c.css.sac,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.engine.value.svg12;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.svg,org.w3c.css.sac,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.css.parser;uses:=&quot;org.apache.batik.i18n,org.apache.batik.util.io,org.w3c.css.sac&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.apache.batik.css.engine,org.apache.batik.css.engine.sac,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.css2,org.apache.batik.css.engine.value.svg,org.apache.batik.css.engine.value.svg12,org.apache.batik.css.parser,org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.io,org.apache.xmlgraphics.java2d.color;resolution:=optional,org.w3c.css.sac,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg,org.w3c.dom.views"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1517,6 +1669,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik SVG DOM implementation"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-svg-dom"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.svg-dom"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.dom.svg;uses:=&quot;org.apache.batik.css.engine,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.util,org.apache.batik.parser,org.apache.batik.util,org.w3c.dom,org.w3c.dom.smil,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.dom.svg12;uses:=&quot;org.apache.batik.dom.events,org.apache.batik.dom.xbl,org.w3c.dom.events,org.w3c.dom.views&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.apache.batik.css.engine,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.ext.awt.geom,org.apache.batik.parser,org.apache.batik.util,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.smil,org.w3c.dom.svg,org.w3c.dom.views"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1539,6 +1702,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik Graphics Vector Tree (GVT)"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-gvt"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.gvt"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.gvt;uses:=&quot;javax.swing.event,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image.renderable,org.apache.batik.gvt.event,org.apache.batik.gvt.filter&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.filter;uses:=&quot;org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.gvt&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.event;uses:=&quot;javax.swing.event,org.apache.batik.gvt&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.font;uses:=&quot;org.apache.batik.gvt,org.apache.batik.gvt.text,org.apache.batik.util&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.flow;uses:=&quot;org.apache.batik.ext.awt.geom,org.apache.batik.gvt.font&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.renderer;uses:=&quot;org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.gvt&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.gvt.text;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="javax.swing.event,org.apache.batik.ext.awt,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.filter,org.apache.batik.gvt.font,org.apache.batik.gvt.text,org.apache.batik.util"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1550,6 +1724,33 @@
-     </jar>
-   </target>
- 
-+  <target name="i18n-jar" depends="init, compile, prepare-build">
-+    <jar jarfile="${build}/lib/${project}-i18n-${completeVersion}.jar">
-+      <manifest>
-+        <attribute name="Implementation-Title" value="Batik i18n library"/>
-+        <attribute name="Implementation-Version" value="${completeVersion}"/>
-+        <attribute name="Implementation-Vendor" value="${vendor}"/>
-+        <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik i18n library"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-i18n"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.i18n"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.i18n;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-+      </manifest>
-+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-+      <fileset dir="${dest}">
-+        <include name="${package-prefix}/i18n/**/*.class"/>
-+      </fileset>
-+      <!-- <fileset dir="batik-i18n/src/main/resources" excludes="**/.svn/">
-+        <include name="${package-prefix}/i18n/**/resources/*"/>
-+      </fileset> -->
-+    </jar>
-+  </target>
- 
-   <!-- Parser (dependencies: util) -->
-   <target name="parser-jar" depends="init, compile, prepare-build">
-@@ -1559,6 +1760,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik SVG microsyntax parser"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-parser"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.parser"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.parser;uses:=&quot;org.apache.batik.ext.awt.geom,org.apache.batik.i18n,org.apache.batik.util.io,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.apache.batik.ext.awt.geom,org.apache.batik.i18n,org.apache.batik.util.io,org.apache.batik.xml,org.w3c.dom"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1579,6 +1791,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik script language support"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-script"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.script"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.script;uses:=&quot;org.apache.batik.i18n,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.script.rhino;uses:=&quot;org.apache.batik.i18n,org.mozilla.javascript&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.script.jpython;uses:=&quot;org.apache.batik.script&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.apache.batik.anim.dom,org.apache.batik.i18n,org.apache.batik.script,org.apache.batik.util,org.mozilla.javascript;resolution:=optional,org.python.core;resolution:=optional,org.python.util;resolution:=optional,org.w3c.dom"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1600,6 +1823,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik SVG transcoder"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-transcoder"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.transcoder"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.transcoder;uses:=&quot;org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.dom.util,org.apache.batik.gvt,org.apache.batik.svggen,org.apache.batik.util,org.w3c.dom,org.xml.sax&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.svg2svg;uses:=&quot;org.apache.batik.transcoder,org.apache.batik.xml&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.keys;uses:=&quot;org.apache.batik.transcoder&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.image.resources;uses:=&quot;org.apache.batik.i18n&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.image;uses:=&quot;org.apache.batik.bridge,org.apache.batik.gvt.renderer,org.apache.batik.transcoder,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.wmf.tosvg;uses:=&quot;org.apache.batik.transcoder&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.wmf;version=&quot;${completeVersion}&quot;,org.apache.batik.transcoder.print;uses:=&quot;org.apache.batik.transcoder,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.bridge.svg12,org.apache.batik.dom.util,org.apache.batik.ext.awt,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.spi,org.apache.batik.gvt,org.apache.batik.gvt.renderer,org.apache.batik.i18n,org.apache.batik.svggen,org.apache.batik.transcoder,org.apache.batik.transcoder.image.resources,org.apache.batik.transcoder.keys,org.apache.batik.util,org.apache.batik.xml,org.w3c.dom,org.w3c.dom.svg,org.xml.sax"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1619,6 +1853,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik XML utilities"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-xml"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.xml"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.xml;uses:=&quot;org.apache.batik.i18n,org.apache.batik.util.io&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.apache.batik.i18n,org.apache.batik.util,org.apache.batik.util.io"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1638,6 +1883,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik bridge"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-bridge"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.bridge"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.bridge;uses:=&quot;org.apache.batik.anim,org.apache.batik.anim.dom,org.apache.batik.anim.timing,org.apache.batik.anim.values,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.svg,org.apache.batik.css.engine.value.svg12,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg,org.apache.batik.dom.xbl,org.apache.batik.ext.awt,org.apache.batik.ext.awt.color,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.spi,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.filter,org.apache.batik.gvt.font,org.apache.batik.gvt.renderer,org.apache.batik.gvt.text,org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.script,org.apache.batik.script.rhino,org.apache.batik.util,org.apache.batik.w3c.dom,org.apache.xmlgraphics.java2d.color,org.mozilla.javascript,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.bridge.svg12;uses:=&quot;javax.swing.event,org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg12,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.flow,org.apache.batik.gvt.text,org.apache.batik.parser,org.apache.batik.script,org.apache.batik.util,org.apache.xml.utils,org.apache.xpath,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="javax.swing.event,javax.xml.transform,org.apache.batik.anim,org.apache.batik.anim.dom,org.apache.batik.anim.timing,org.apache.batik.anim.values,org.apache.batik.bridge,org.apache.batik.bridge.svg12,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.svg,org.apache.batik.css.engine.value.svg12,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg,org.apache.batik.dom.svg12,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.ext.awt,org.apache.batik.ext.awt.color,org.apache.batik.ext.awt.geom,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.spi,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.filter,org.apache.batik.gvt.flow,org.apache.batik.gvt.font,org.apache.batik.gvt.renderer,org.apache.batik.gvt.text,org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.script,org.apache.batik.script.rhino,org.apache.batik.util,org.apache.batik.util.io,org.apache.batik.w3c.dom,org.apache.batik.xml,org.apache.xml.utils,org.apache.xmlgraphics.java2d.color,org.apache.xmlgraphics.java2d.color.profile,org.apache.xpath,org.apache.xpath.objects,org.mozilla.javascript;resolution:=optional,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg,org.w3c.dom.views,org.w3c.dom.xpath"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1650,6 +1906,31 @@
-     </jar>
-   </target>
- 
-+  <target name="constants-jar" depends="init, compile, prepare-build">
-+    <jar jarfile="${build}/lib/${project}-constants-${completeVersion}.jar">
-+      <manifest>
-+        <attribute name="Implementation-Title" value="Batik constants library"/>
-+        <attribute name="Implementation-Version" value="${completeVersion}"/>
-+        <attribute name="Implementation-Vendor" value="${vendor}"/>
-+        <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik constants library"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-constants"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.constants"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.util;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-+      </manifest>
-+      <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-+      <fileset dir="${dest}">
-+        <include name="${package-prefix}/util/XMLConstants*.class"/>
-+      </fileset>
-+    </jar>
-+  </target>
-+
-   <!-- Swing (dependencies: all) -->
-   <target name="swing-jar" depends="init, compile, prepare-build">
-     <jar jarfile="${build}/lib/${project}-swing-${completeVersion}.jar">
-@@ -1658,6 +1939,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik SVG Swing components"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-swing"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.swing"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.swing;uses:=&quot;javax.swing,javax.swing.event,org.apache.batik.bridge,org.apache.batik.i18n,org.apache.batik.swing.gvt,org.apache.batik.swing.svg,org.apache.batik.util,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.swing.svg;uses:=&quot;javax.swing.filechooser,org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.renderer,org.apache.batik.i18n,org.apache.batik.script,org.apache.batik.swing.gvt,org.apache.batik.util,org.w3c.dom,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.swing.gvt;uses:=&quot;javax.swing,org.apache.batik.bridge,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.renderer,org.apache.batik.util&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="javax.swing,javax.swing.event,javax.swing.filechooser,org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.bridge.svg12,org.apache.batik.css.engine,org.apache.batik.dom.events,org.apache.batik.dom.util,org.apache.batik.ext.awt.image.spi,org.apache.batik.gvt,org.apache.batik.gvt.event,org.apache.batik.gvt.renderer,org.apache.batik.i18n,org.apache.batik.script,org.apache.batik.swing.gvt,org.apache.batik.swing.svg,org.apache.batik.util,org.apache.batik.util.gui,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.svg"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1677,6 +1969,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik animation engine"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-anim"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.anim"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.anim;uses:=&quot;org.apache.batik.anim.dom,org.apache.batik.anim.timing,org.apache.batik.anim.values,org.apache.batik.ext.awt.geom,org.apache.batik.util,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.anim.dom;uses:=&quot;org.apache.batik.anim.values,org.apache.batik.css.dom,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.parser,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.util,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.stylesheets,org.w3c.dom.svg,org.w3c.dom.views,org.xml.sax&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.anim.timing;uses:=&quot;org.apache.batik.anim,org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.util,org.w3c.dom,org.w3c.dom.events&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.anim.values;uses:=&quot;org.apache.batik.anim.dom,org.apache.batik.dom.svg&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.apache.batik.anim,org.apache.batik.anim.dom,org.apache.batik.anim.timing,org.apache.batik.anim.values,org.apache.batik.css.dom,org.apache.batik.css.engine,org.apache.batik.css.engine.value,org.apache.batik.css.engine.value.svg,org.apache.batik.css.parser,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg,org.apache.batik.dom.svg12,org.apache.batik.dom.util,org.apache.batik.dom.xbl,org.apache.batik.ext.awt.geom,org.apache.batik.i18n,org.apache.batik.parser,org.apache.batik.util,org.apache.batik.w3c.dom.events,org.w3c.css.sac,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.smil,org.w3c.dom.stylesheets,org.w3c.dom.svg,org.w3c.dom.views,org.xml.sax"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1699,6 +2002,17 @@
-         <attribute name="Implementation-Version" value="${completeVersion}"/>
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-+        <attribute name="Bundle-Description" value="Batik Extension Support"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-extension"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.extension"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.extension.svg;uses:=&quot;org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.dom,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.extension,org.apache.batik.gvt,org.apache.batik.gvt.font,org.apache.batik.gvt.text,org.apache.batik.parser,org.w3c.dom&quot;;version=&quot;${completeVersion}&quot;,org.apache.batik.extension;uses:=&quot;org.apache.batik.anim.dom,org.apache.batik.css.engine,org.apache.batik.dom,org.apache.batik.util,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.svg&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.apache.batik.anim.dom,org.apache.batik.bridge,org.apache.batik.css.engine,org.apache.batik.dom,org.apache.batik.dom.events,org.apache.batik.dom.svg,org.apache.batik.dom.util,org.apache.batik.ext.awt.image,org.apache.batik.ext.awt.image.renderable,org.apache.batik.ext.awt.image.rendered,org.apache.batik.extension,org.apache.batik.gvt,org.apache.batik.gvt.font,org.apache.batik.gvt.text,org.apache.batik.parser,org.apache.batik.util,org.w3c.dom,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.svg"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1729,14 +2043,17 @@
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-         <attribute name="Main-Class" value="org.apache.batik.apps.svgpp.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-+        <attribute name="Bundle-Description" value="Batik SVG Pretty Printer Application"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-svgpp"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.svgpp"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.apps.svgpp;uses:=&quot;org.apache.batik.i18n,org.apache.batik.transcoder&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="org.apache.batik.i18n,org.apache.batik.transcoder,org.apache.batik.transcoder.svg2svg"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1767,26 +2084,17 @@
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-         <attribute name="Main-Class" value="org.apache.batik.apps.slideshow.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-css-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-svg-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gvt-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-script-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-bridge-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-anim-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gui-uti-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-awt-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
-+        <attribute name="Bundle-Description" value="Batik SVG Slideshow Application"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-slideshow"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.slideshow"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-+        <attribute name="Export-Package" value="org.apache.batik.apps.slideshow;uses:=&quot;javax.swing&quot;;version=&quot;${completeVersion}&quot;"/>
-+        <attribute name="Import-Package" value="javax.swing,org.apache.batik.bridge,org.apache.batik.gvt,org.apache.batik.gvt.renderer,org.w3c.dom,org.w3c.dom.svg"/>
-+        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1823,29 +2131,14 @@
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main" />
-         <attribute name="Build-Id" value="${build.id}"/>
-        <!-- this causes ant to emit bogus warning regarding multiple class-path entries -->
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-css-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-svg-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gvt-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-script-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-bridge-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-swing-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-anim-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gui-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-awt-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar"/>
-+        <attribute name="Bundle-Description" value="Batik SVG Browser Application"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-squiggle"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.squiggle"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1888,8 +2181,14 @@
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-squiggle-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-${project}-extension-${completeVersion}.ja" />
-+        <attribute name="Bundle-Description" value="Batik SVG Browser Application with Extensions"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-squiggle-ext"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.squiggle-ext"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
-@@ -1935,28 +2234,14 @@
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Main-Class" value="org.apache.batik.apps.rasterizer.Main" />
-         <attribute name="Build-Id" value="${build.id}"/>
-        <!-- this causes ant to emit bogus warning regarding multiple class-path entries -->
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-ext-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-css-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-svg-dom-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-gvt-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-parser-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-script-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-bridge-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-anim-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-transcoder-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-awt-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-codec-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-xml-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xerces_2_5_0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xalan-2.7.0.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}js.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}fop-transcoder-allinone-${fopVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}xmlgraphics-commons-${xgcVersion}.jar" />
-+        <attribute name="Bundle-Description" value="Batik SVG Rasterizer Application"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-rasterizer"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.rasterizer"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -1996,8 +2281,14 @@
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/>
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-extension-${jarVersion}.jar" />
-        <attribute name="Class-Path" value="${jarsLibDir}${project}-rasterizer-${jarVersion}.jar" />
-+        <attribute name="Bundle-Description" value="Batik SVG Rasterizer Application with Extensions"/>
-+        <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+        <attribute name="Bundle-ManifestVersion" value="2"/>
-+        <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-rasterizer-ext"/>
-+        <attribute name="Bundle-SymbolicName" value="org.apache.batik.rasterizer-ext"/>
-+        <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+        <attribute name="Bundle-Version" value="${completeVersion}"/>
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/">
-@@ -2033,8 +2324,17 @@
-       <attribute name="Implementation-Vendor" value="${vendor}"/>
-       <attribute name="Build-Id" value="${build.id}"/>
-       <attribute name="Main-Class" value="org.apache.batik.apps.ttf2svg.Main"/>
-      <attribute name="Class-Path" value="${jarsLibDir}${project}-svggen-${jarVersion}.jar" />
-      <attribute name="Class-Path" value="${jarsLibDir}${project}-util-${jarVersion}.jar" />
-+      <attribute name="Bundle-Description" value="Batik Truetype Font to SVG Font Converter Application"/>
-+      <attribute name="Bundle-DocURL" value="http://www.apache.org/"/>
-+      <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-+      <attribute name="Bundle-ManifestVersion" value="2"/>
-+      <attribute name="Bundle-Name" value="org.apache.xmlgraphics:batik-ttf2svg"/>
-+      <attribute name="Bundle-SymbolicName" value="org.apache.batik.ttf2svg"/>
-+      <attribute name="Bundle-Vendor" value="Apache Software Foundation"/>
-+      <attribute name="Bundle-Version" value="${completeVersion}"/>
-+      <attribute name="Export-Package" value="org.apache.batik.apps.ttf2svg;version=&quot;${completeVersion}&quot;"/>
-+      <attribute name="Import-Package" value="org.apache.batik.svggen.font"/>
-+      <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.6))&quot;"/>
-     </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-       <fileset dir="${dest}">
-@@ -2052,34 +2352,6 @@
-         <attribute name="Implementation-Vendor" value="${vendor}"/>
-         <attribute name="Build-Id" value="${build.id}"/>
-         <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main" />
-        <!-- this causes ant to emit bogus warning regarding multiple class-path entries -->
-        <attribute name="Class-Path" value="lib/${project}-ext-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-dom-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-css-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-svg-dom-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-gvt-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-parser-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-script-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-bridge-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-swing-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-anim-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-transcoder-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-gui-util-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-awt-util-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-codec-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-util-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-svggen-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/${project}-xml-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${project}-squiggle-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${project}-rasterizer-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="${project}-svgpp-${completeVersion}.jar" />
-        <attribute name="Class-Path" value="lib/xercesImpl-2.9.1.jar" />
-        <attribute name="Class-Path" value="lib/xalan-2.7.2.jar" />
-        <attribute name="Class-Path" value="lib/xml-apis-1.3.04.jar" />
-        <attribute name="Class-Path" value="lib/xml-apis-ext-1.3.04.jar" />
-        <attribute name="Class-Path" value="lib/js.jar" />
-        <attribute name="Class-Path" value="lib/fop-transcoder-allinone-${fopVersion}.jar" />
-        <attribute name="Class-Path" value="lib/xmlgraphics-commons-${xgcVersion}.jar" />
-       </manifest>
-       <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
-     </jar>
--- a/xmlgraphics-batik-policy.patch
+++ b/xmlgraphics-batik-policy.patch
@ -1,36 +0,0 @@
-Index: batik-1.8/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy
-===================================================================
--- batik-1.8.orig/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy
-+++ batik-1.8/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy
-@@ -30,6 +30,11 @@ grant codeBase "${app.jar.base}/batik-ra
-   permission java.security.AllPermission;
- };
- 
-+//new stuff
-+grant codeBase "${app.jar.base}/batik-all.jar" {
-+  permission java.security.AllPermission;
-+};
-+
- grant codeBase "${app.jar.base}/lib/batik-ext.jar" {
-   permission java.security.AllPermission;
- };
-Index: batik-1.8/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy
-===================================================================
--- batik-1.8.orig/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy
-+++ batik-1.8/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy
-@@ -34,6 +34,10 @@ grant codeBase "${app.jar.base}/batik-sq
-   permission java.security.AllPermission;
- };
- 
-+grant codeBase "${app.jar.base}/batik-all.jar" {
-+  permission java.security.AllPermission;
-+};
-+
- grant codeBase "${app.jar.base}/lib/batik-ext.jar" {
-   permission java.security.AllPermission;
- };
-@@ -108,4 +112,3 @@ grant codeBase "${app.jar.base}/lib/js.j
- grant {
-   permission java.io.FilePermission "lib/batik-svg-dom.jar", "read";
- };
-
--- a/xmlgraphics-batik-securitymanager.patch
+++ b/xmlgraphics-batik-securitymanager.patch
@ -1,11 +0,0 @@
--- batik-1.9/batik-swing/src/main/java/org/apache/batik/swing/gvt/JGVTComponent.java	2017-03-17 16:56:33.000000000 +0100
-+++ batik-1.9/batik-swing/src/main/java/org/apache/batik/swing/gvt/JGVTComponent.java	2018-07-11 12:01:32.743072432 +0200
-@@ -1275,7 +1275,7 @@
-             securityManager = System.getSecurityManager();
-             if (securityManager != null) {
-                 try {
-                    securityManager.checkSystemClipboardAccess();
-+                    securityManager.checkPermission(new java.awt.AWTPermission("accessClipboard"));
-                 } catch (SecurityException e) {
-                     return; // Can't access clipboard.
-                 }
--- a/xmlgraphics-batik-squiggle.desktop
+++ b/xmlgraphics-batik-squiggle.desktop
@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Batik Squiggle
-Comment=SVG browser
-Comment[fi]=SVG-selain
-Exec=xmlgraphics-batik-squiggle
-Terminal=false
-Type=Application
-Icon=squiggle
-Categories=Graphics;VectorGraphics;Java;X-JPackage;
-MimeType=image/svg+xml;
--- a/xmlgraphics-batik.changes
+++ b/xmlgraphics-batik.changes
@ -1,7 +1,37 @@
+-------------------------------------------------------------------
+Fri Apr  3 09:26:49 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 1.12
+  * Java 7 or later is minimum runtime required
+  * BATIK-1203: ImageTagRegistry forgets to reinitialize cache
+  * BATIK-1251: Correct policy file in Squiggle
+  * BATIK-1253: build.sh referenced from build.xml
+  * BATIK-1257: Rasterizer - insufficient permissions when
+    transcoding to PDF
+  * BATIK-1272: Update Xerces to 2.12
+  * BATIK-1232: Zip release should use mvn jars
+  * BATIK-1233: Add policy file for batik-rasterizer
+  * BATIK-1234: Tools cannot be run using java -jar xxx.jar when
+    built with Maven
+  * BATIK-1240: Java 11 compile error
+  * BATIK-1249: Fix Java 11 module error
+- Remove the *.script files and generate the scripts using the
+  %%jpackage_script macro
+- Generate an ant build system from the maven poms and use it for
+  the first phase build
+- Removed patches:
+  * xmlgraphics-batik-manifests.patch
+    + The manifests are now generated in the first phase build
+  * xmlgraphics-batik-policy.patch
+    + We override the policy setting by granting all rights to
+      svgbrowser and to rasterizer
+  * xmlgraphics-batik-securitymanager.patch
+    + Integrated upstream
+
 -------------------------------------------------------------------
 Mon Mar 16 13:43:43 UTC 2020 - Fridrich Strba <fstrba@suse.com>

- Mofified patch:
+- Modified patch:
  * xmlgraphics-batik-manifests.patch
    + Extend the bundle manifest so that it is useful for eclipse

--- a/xmlgraphics-batik.rasterizer.script
+++ b/xmlgraphics-batik.rasterizer.script
@ -1,36 +0,0 @@
-#!/bin/sh
-# 
-# Batik SVG Rasterizer script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find functions library, aborting"
-  exit 1
-fi
-
-# Source system prefs
-if [ -f /etc/xmlgraphics-batik-rasterizer.conf ] ; then 
-  . /etc/xmlgraphics-batik-rasterizer.conf
-fi
-
-# Source user prefs
-if [ -f $HOME/.xmlgraphics-batik-rasterizerrc ] ; then 
-  . $HOME/.xmlgraphics-batik-rasterizerrc
-fi
-
-# Configuration
-MAIN_CLASS=org.apache.batik.apps.rasterizer.Main
-BASE_JARS="xmlgraphics-batik/rasterizer xmlgraphics-batik/util xmlgraphics-batik/transcoder xmlgraphics-batik/parser"
-BASE_FLAGS="-Djava.security.policy=/etc/xmlgraphics-batik/rasterizer.policy"
-
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"
--- a/xmlgraphics-batik.rasterizer.policy
+++ b/xmlgraphics-batik.rasterizer.policy
--- a/xmlgraphics-batik.slideshow.script
+++ b/xmlgraphics-batik.slideshow.script
@ -1,35 +0,0 @@
-#!/bin/sh
-# 
-# Batik SVG Slideshow script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find functions library, aborting"
-  exit 1
-fi
-
-# Source system prefs
-if [ -f /etc/xmlgraphics-batik-slideshow.conf ] ; then 
-  . /etc/xmlgraphics-batik-slideshow.conf
-fi
-
-# Source user prefs
-if [ -f $HOME/.xmlgraphics-batik-slideshowrc ] ; then 
-  . $HOME/.xmlgraphics-batik-slideshowrc
-fi
-
-# Configuration
-MAIN_CLASS=org.apache.batik.apps.slideshow.Main
-BASE_JARS="xmlgraphics-batik/slideshow xmlgraphics-batik/bridge"
-
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"
--- a/xmlgraphics-batik.spec
+++ b/xmlgraphics-batik.spec
@ -17,26 +17,19 @@
 #


+%global classpath xmlgraphics-batik:rhino:xml-commons-apis:xml-commons-apis-ext:xmlgraphics-commons
 Name:           xmlgraphics-batik
-Version:        1.10
+Version:        1.12
 Release:        0
 Summary:        Scalable Vector Graphics for Java
 License:        Apache-2.0
 Group:          Productivity/Graphics/Vector Editors
-URL:            http://xml.apache.org/batik/
-Source:         http://archive.apache.org/dist/xmlgraphics/batik/source/batik-src-%{version}.tar.gz
-Source1:        %{name}.squiggle.script
-Source2:        %{name}.svgpp.script
-Source3:        %{name}.ttf2svg.script
-Source4:        %{name}.rasterizer.script
-Source5:        %{name}.slideshow.script
-Source6:        %{name}-squiggle.desktop
-Source7:        %{name}.rasterizer.policy
+URL:            https://xml.apache.org/batik/
+Source0:        http://archive.apache.org/dist/xmlgraphics/batik/source/batik-src-%{version}.tar.gz
+Source1:        batik-build.tar.xz
+Source7:        %{name}.security.policy
 Patch0:         %{name}-nolinksinjavadoc.patch
-Patch1:         %{name}-manifests.patch
-Patch2:         %{name}-policy.patch
-Patch3:         %{name}-securitymanager.patch
-Patch4:         0001-Fix-imageio-codec-lookup.patch
+Patch1:         0001-Fix-imageio-codec-lookup.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local
@ -150,20 +143,16 @@ Provides:       batik-demo = %{version}-%{release}
 Demonstrations and samples for %{name}.

 %prep
-%setup -q -n batik-%{version}
+%setup -q -n batik-%{version} -a1

 find -name '*.class' -delete
 find -name '*.jar' -delete

 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1

 cp -p %{SOURCE7} batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.policy
 cp -p %{SOURCE7} batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.policy
-rm -rf batik-script/src/main/java/org/apache/batik/script/jacl

 # It's an uberjar, it shouldn't have requires
 %pom_xpath_inject pom:dependency '<optional>true</optional>' batik-all
@ -195,42 +184,34 @@ build-jar-repository -s lib js xml-apis xml-commons-apis-ext xalan-j2 xmlgraphic
 %build
 export CLASSPATH=
 export OPT_JAR_LIST=:
-ant \
-    -Dant.build.javac.source=6 -Dant.build.javac.target=6 \
-	all-jar jars javadoc
+%{ant} \
+    -f build-batik.xml -Dtest.skip=true \
+	package
+%{ant} \
+    -Dant.build.javac.source=7 -Dant.build.javac.target=7 \
+    all-jar jars javadoc

 %install

 # jars
 mkdir -p %{buildroot}%{_javadir}/%{name}

-# This one is empty and useless...
-rm batik-%{version}/batik-%{version}.jar
-
 for dir in batik-%{version} batik-%{version}/lib batik-%{version}/extensions; do
  pushd ${dir}
    for jar in batik-*.jar; do
      basename=`basename ${jar} .jar`
-      name=`echo ${basename} | sed -e 's/batik-//'`
+      name=`echo ${basename} | sed -e 's/batik-//' | sed -e 's/-%{version}//' `
      cp -p ${jar} %{buildroot}%{_javadir}/%{name}/${name}.jar
    done
  popd
 done

 for pkg in squiggle squiggle-ext svgpp ttf2svg rasterizer rasterizer-ext slideshow; do
-  ln -s %{name}/${pkg}-%{version}.jar %{buildroot}%{_javadir}/batik-${pkg}-%{version}.jar
+  ln -s %{name}/${pkg}.jar %{buildroot}%{_javadir}/batik-${pkg}.jar
 done

-mv %{buildroot}%{_javadir}/%{name}/all-%{version}.jar %{buildroot}%{_javadir}/%{name}-all-%{version}.jar
-ln -s %{name}-all-%{version}.jar %{buildroot}%{_javadir}/batik-all-%{version}.jar
-
-for dir in %{buildroot}%{_javadir} %{buildroot}%{_javadir}/%{name}; do
-  pushd ${dir}
-    for jar in *-%{version}*.jar; do
-      ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`;
-    done
-  popd
-done
+mv %{buildroot}%{_javadir}/%{name}/all.jar %{buildroot}%{_javadir}/%{name}-all.jar
+ln -s %{name}-all.jar %{buildroot}%{_javadir}/batik-all.jar

 #pom
 mkdir -p %{buildroot}%{_mavenpomdir}/%{name}
@ -239,45 +220,44 @@ cp -p pom.xml %{buildroot}%{_mavenpomdir}/%{name}/parent.pom
 %add_maven_depmap %{name}/parent.pom

 cp -p batik-all/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-all.pom
-%add_maven_depmap %{name}-all.pom %{name}-all-%{version}.jar
+%add_maven_depmap %{name}-all.pom %{name}-all.jar

 for i in anim awt-util bridge codec constants dom ext extension gvt i18n parser script svg-dom svgbrowser svggen svgrasterizer swing transcoder util gui-util xml;
 do
  cp -p batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
-  %add_maven_depmap %{name}/${i}.pom %{name}/${i}-%{version}.jar
+  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
 done

 cp -p batik-css/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/css.pom
-%add_maven_depmap %{name}/css.pom %{name}/css-%{version}.jar -f css
+%add_maven_depmap %{name}/css.pom %{name}/css.jar -f css

 cp -p batik-svgpp/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/svgpp.pom
-%add_maven_depmap %{name}/svgpp.pom %{name}/svgpp-%{version}.jar -f svgpp
+%add_maven_depmap %{name}/svgpp.pom %{name}/svgpp.jar -f svgpp

 cp -p batik-ttf2svg/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/ttf2svg.pom
-%add_maven_depmap %{name}/ttf2svg.pom %{name}/ttf2svg-%{version}.jar -f ttf2svg
+%add_maven_depmap %{name}/ttf2svg.pom %{name}/ttf2svg.jar -f ttf2svg

 cp -p batik-slideshow/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/slideshow.pom
-%add_maven_depmap %{name}/slideshow.pom %{name}/slideshow-%{version}.jar -f slideshow
+%add_maven_depmap %{name}/slideshow.pom %{name}/slideshow.jar -f slideshow

 for i in squiggle squiggle-ext;
 do
  cp -p batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
-  %add_maven_depmap %{name}/${i}.pom %{name}/${i}-%{version}.jar -f squiggle
+  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f squiggle
 done

 for i in rasterizer rasterizer-ext;
 do
  cp -p batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
-  %add_maven_depmap %{name}/${i}.pom %{name}/${i}-%{version}.jar -f rasterizer
+  %add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar -f rasterizer
 done

 # scripts
-mkdir -p %{buildroot}%{_bindir}
-cp -p %{SOURCE1} %{buildroot}%{_bindir}/%{name}-squiggle
-cp -p %{SOURCE2} %{buildroot}%{_bindir}/%{name}-svgpp
-cp -p %{SOURCE3} %{buildroot}%{_bindir}/%{name}-ttf2svg
-cp -p %{SOURCE4} %{buildroot}%{_bindir}/%{name}-rasterizer
-cp -p %{SOURCE5} %{buildroot}%{_bindir}/%{name}-slideshow
+%jpackage_script org.apache.batik.apps.svgbrowser.Main '' '' %{classpath} %{name}-squiggle true
+%jpackage_script org.apache.batik.apps.svgpp.Main '' '' %{classpath} %{name}-svgpp true
+%jpackage_script org.apache.batik.apps.ttf2svg.Main '' '' %{classpath} %{name}-ttf2svg true
+%jpackage_script org.apache.batik.apps.rasterizer.Main '' '' %{classpath} %{name}-rasterizer true
+%jpackage_script org.apache.batik.apps.slideshow.Main '' '' %{classpath} %{name}-slideshow true

 # demo
 mkdir -p %{buildroot}%{_datadir}/%{name}
@ -295,188 +275,40 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name}
 cp -pr batik-%{version}/docs/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}

-%files
-%defattr(0644,root,root,0755)
+%files -f .mfiles
 %license LICENSE NOTICE
 %doc KEYS MAINTAIN README
-%dir %{_javadir}/%{name}
-%{_javadir}/%{name}-all-%{version}.jar
-%{_javadir}/%{name}-all.jar
-%{_javadir}/batik-all-%{version}.jar
 %{_javadir}/batik-all.jar
-%{_javadir}/%{name}/anim-%{version}.jar
-%{_javadir}/%{name}/anim.jar
-%{_javadir}/%{name}/awt-util-%{version}.jar
-%{_javadir}/%{name}/awt-util.jar
-%{_javadir}/%{name}/bridge-%{version}.jar
-%{_javadir}/%{name}/bridge.jar
-%{_javadir}/%{name}/codec-%{version}.jar
-%{_javadir}/%{name}/codec.jar
-%{_javadir}/%{name}/constants-%{version}.jar
-%{_javadir}/%{name}/constants.jar
-%{_javadir}/%{name}/dom-%{version}.jar
-%{_javadir}/%{name}/dom.jar
-%{_javadir}/%{name}/ext-%{version}.jar
-%{_javadir}/%{name}/ext.jar
-%{_javadir}/%{name}/extension-%{version}.jar
-%{_javadir}/%{name}/extension.jar
-%{_javadir}/%{name}/gui-util-%{version}.jar
-%{_javadir}/%{name}/gui-util.jar
-%{_javadir}/%{name}/gvt-%{version}.jar
-%{_javadir}/%{name}/gvt.jar
-%{_javadir}/%{name}/i18n-%{version}.jar
-%{_javadir}/%{name}/i18n.jar
-%{_javadir}/%{name}/parser-%{version}.jar
-%{_javadir}/%{name}/parser.jar
-%{_javadir}/%{name}/script-%{version}.jar
-%{_javadir}/%{name}/script.jar
-%{_javadir}/%{name}/svg-dom-%{version}.jar
-%{_javadir}/%{name}/svg-dom.jar
-%{_javadir}/%{name}/svgbrowser-%{version}.jar
-%{_javadir}/%{name}/svgbrowser.jar
-%{_javadir}/%{name}/svggen-%{version}.jar
-%{_javadir}/%{name}/svggen.jar
-%{_javadir}/%{name}/svgrasterizer-%{version}.jar
-%{_javadir}/%{name}/svgrasterizer.jar
-%{_javadir}/%{name}/swing-%{version}.jar
-%{_javadir}/%{name}/swing.jar
-%{_javadir}/%{name}/transcoder-%{version}.jar
-%{_javadir}/%{name}/transcoder.jar
-%{_javadir}/%{name}/util-%{version}.jar
-%{_javadir}/%{name}/util.jar
-%{_javadir}/%{name}/xml-%{version}.jar
-%{_javadir}/%{name}/xml.jar
-%dir %{_mavenpomdir}/%{name}
-%{_mavenpomdir}/%{name}-all.pom
-%{_mavenpomdir}/%{name}/anim.pom
-%{_mavenpomdir}/%{name}/awt-util.pom
-%{_mavenpomdir}/%{name}/bridge.pom
-%{_mavenpomdir}/%{name}/codec.pom
-%{_mavenpomdir}/%{name}/constants.pom
-%{_mavenpomdir}/%{name}/dom.pom
-%{_mavenpomdir}/%{name}/ext.pom
-%{_mavenpomdir}/%{name}/extension.pom
-%{_mavenpomdir}/%{name}/gui-util.pom
-%{_mavenpomdir}/%{name}/gvt.pom
-%{_mavenpomdir}/%{name}/i18n.pom
-%{_mavenpomdir}/%{name}/parent.pom
-%{_mavenpomdir}/%{name}/parser.pom
-%{_mavenpomdir}/%{name}/script.pom
-%{_mavenpomdir}/%{name}/svg-dom.pom
-%{_mavenpomdir}/%{name}/svgbrowser.pom
-%{_mavenpomdir}/%{name}/svggen.pom
-%{_mavenpomdir}/%{name}/svgrasterizer.pom
-%{_mavenpomdir}/%{name}/swing.pom
-%{_mavenpomdir}/%{name}/transcoder.pom
-%{_mavenpomdir}/%{name}/util.pom
-%{_mavenpomdir}/%{name}/xml.pom
-%if %{defined _maven_repository}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml
-%endif
-%dir %{_sysconfdir}/%{name}

-%files css
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/css-%{version}.jar
-%{_javadir}/%{name}/css.jar
-%{_mavenpomdir}/%{name}/css.pom
-%if %{defined _maven_repository}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}-css
-%else
-%{_datadir}/maven-metadata/%{name}-css.xml
-%endif
+%files css -f .mfiles-css

-%files squiggle
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/squiggle-%{version}.jar
-%{_javadir}/%{name}/squiggle.jar
-%{_javadir}/%{name}/squiggle-ext-%{version}.jar
-%{_javadir}/%{name}/squiggle-ext.jar
-%{_javadir}/batik-squiggle-%{version}.jar
-%{_javadir}/batik-squiggle.jar
-%{_javadir}/batik-squiggle-ext-%{version}.jar
+%files squiggle -f .mfiles-squiggle
 %{_javadir}/batik-squiggle-ext.jar
-%{_mavenpomdir}/%{name}/squiggle.pom
-%{_mavenpomdir}/%{name}/squiggle-ext.pom
-%if %{defined _maven_repository}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}-squiggle
-%else
-%{_datadir}/maven-metadata/%{name}-squiggle.xml
-%endif
-%attr(0755,root,root) %{_bindir}/%{name}-squiggle
+%{_javadir}/batik-squiggle.jar
+%{_bindir}/%{name}-squiggle

-%files svgpp
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/svgpp-%{version}.jar
-%{_javadir}/%{name}/svgpp.jar
-%{_javadir}/batik-svgpp-%{version}.jar
+%files svgpp -f .mfiles-svgpp
 %{_javadir}/batik-svgpp.jar
-%{_mavenpomdir}/%{name}/svgpp.pom
-%if %{defined _maven_repository}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}-svgpp
-%else
-%{_datadir}/maven-metadata/%{name}-svgpp.xml
-%endif
-%attr(0755,root,root) %{_bindir}/%{name}-svgpp
+%{_bindir}/%{name}-svgpp

-%files ttf2svg
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/ttf2svg-%{version}.jar
-%{_javadir}/%{name}/ttf2svg.jar
-%{_javadir}/batik-ttf2svg-%{version}.jar
+%files ttf2svg -f .mfiles-ttf2svg
 %{_javadir}/batik-ttf2svg.jar
-%{_mavenpomdir}/%{name}/ttf2svg.pom
-%if %{defined _maven_repository}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}-ttf2svg
-%else
-%{_datadir}/maven-metadata/%{name}-ttf2svg.xml
-%endif
-%attr(0755,root,root) %{_bindir}/%{name}-ttf2svg
+%{_bindir}/%{name}-ttf2svg

-%files rasterizer
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/rasterizer-%{version}.jar
-%{_javadir}/%{name}/rasterizer.jar
-%{_javadir}/%{name}/rasterizer-ext-%{version}.jar
-%{_javadir}/%{name}/rasterizer-ext.jar
-%{_javadir}/batik-rasterizer-%{version}.jar
+%files rasterizer -f .mfiles-rasterizer
 %{_javadir}/batik-rasterizer.jar
-%{_javadir}/batik-rasterizer-ext-%{version}.jar
 %{_javadir}/batik-rasterizer-ext.jar
-%{_mavenpomdir}/%{name}/rasterizer.pom
-%{_mavenpomdir}/%{name}/rasterizer-ext.pom
-%if %{defined _maven_repository}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}-rasterizer
-%else
-%{_datadir}/maven-metadata/%{name}-rasterizer.xml
-%endif
-%attr(0755,root,root) %{_bindir}/%{name}-rasterizer
+%{_bindir}/%{name}-rasterizer
+%dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/rasterizer.policy

-%files slideshow
-%defattr(0644,root,root,0755)
-%{_javadir}/%{name}/slideshow-%{version}.jar
-%{_javadir}/%{name}/slideshow.jar
-%{_javadir}/batik-slideshow-%{version}.jar
+%files slideshow -f .mfiles-slideshow
 %{_javadir}/batik-slideshow.jar
-%{_mavenpomdir}/%{name}/slideshow.pom
-%if %{defined _maven_repository}
-%config(noreplace) %{_mavendepmapfragdir}/%{name}-slideshow
-%else
-%{_datadir}/maven-metadata/%{name}-slideshow.xml
-%endif
-%attr(0755,root,root) %{_bindir}/%{name}-slideshow
+%{_bindir}/%{name}-slideshow

 %files demo
-%defattr(0644,root,root,0755)
 %{_datadir}/%{name}
 %{_datadir}/batik
-%exclude %{_datadir}/%{name}/contrib/rasterizertask/build.sh
-%exclude %{_datadir}/%{name}/contrib/charts/convert.sh
-%attr(0755,root,root) %{_datadir}/%{name}/contrib/rasterizertask/build.sh
-%attr(0755,root,root) %{_datadir}/%{name}/contrib/charts/convert.sh

 %files javadoc
 %license LICENSE NOTICE
--- a/xmlgraphics-batik.squiggle.script
+++ b/xmlgraphics-batik.squiggle.script
@ -1,34 +0,0 @@
-#!/bin/sh
-# 
-# Batik SVG Browser (Squiggle) script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find functions library, aborting"
-  exit 1
-fi
-
-# Source system prefs
-if [ -f /etc/xmlgraphics-batik-squiggle.conf ] ; then 
-  . /etc/xmlgraphics-batik-squiggle.conf
-fi
-
-# Source user prefs
-if [ -f $HOME/.xmlgraphics-batik-squigglerc ] ; then 
-  . $HOME/.xmlgraphics-batik-squigglerc
-fi
-
-# Configuration
-MAIN_CLASS=org.apache.batik.apps.svgbrowser.Main
-BASE_JARS="xmlgraphics-batik/squiggle xmlgraphics-batik/swing xmlgraphics-batik/gui-util xmlgraphics-batik/bridge xmlgraphics-batik/util xmlgraphics-batik/dom rhino xml-commons-jaxp-1.3-apis xml-commons-jaxp-1.3-apis-ext"
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"
--- a/xmlgraphics-batik.svgpp.script
+++ b/xmlgraphics-batik.svgpp.script
@ -1,35 +0,0 @@
-#!/bin/sh
-# 
-# Batik SVG Pretty Printer script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find functions library, aborting"
-  exit 1
-fi
-
-# Source system prefs
-if [ -f /etc/xmlgraphics-batik-svgpp.conf ] ; then 
-  . /etc/xmlgraphics-batik-svgpp.conf
-fi
-
-# Source user prefs
-if [ -f $HOME/.xmlgraphics-batik-svgpprc ] ; then 
-  . $HOME/.xmlgraphics-batik-svgpprc
-fi
-
-# Configuration
-MAIN_CLASS=org.apache.batik.apps.svgpp.Main
-BASE_JARS="xmlgraphics-batik/svgpp xmlgraphics-batik/transcoder xmlgraphics-batik/util"
-
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"
--- a/xmlgraphics-batik.ttf2svg.script
+++ b/xmlgraphics-batik.ttf2svg.script
@ -1,35 +0,0 @@
-#!/bin/sh
-# 
-# Batik SVG Font Converter script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find functions library, aborting"
-  exit 1
-fi
-
-# Source user prefs
-if [ -f /etc/xmlgraphics-batik-ttf2svg.conf ] ; then 
-  . /etc/xmlgraphics-batik-ttf2svg.conf
-fi
-
-# Allow user-defined prefs
-if [ -f $HOME/.xmlgraphics-batik-ttf2svgrc ] ; then 
-  . $HOME/.xmlgraphics-batik-ttf2svgrc
-fi
-
-# Configuration
-MAIN_CLASS=org.apache.batik.apps.ttf2svg.Main
-BASE_JARS="xmlgraphics-batik/ttf2svg xmlgraphics-batik/svggen xmlgraphics-batik/util"
-
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"