From 06b1b5af30449fee5e8b9c67b77f2c5964ad0615226092fc65076aaacdc6aa3f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 3 Apr 2020 09:40:49 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-batik?expand=0&rev=36 --- batik-build.tar.xz | 3 + batik-src-1.10.tar.gz | 3 - batik-src-1.12.tar.gz | 3 + xmlgraphics-batik-manifests.patch | 716 ------------------ xmlgraphics-batik-policy.patch | 36 - xmlgraphics-batik-securitymanager.patch | 11 - xmlgraphics-batik-squiggle.desktop | 10 - xmlgraphics-batik.changes | 32 +- xmlgraphics-batik.rasterizer.script | 36 - ...olicy => xmlgraphics-batik.security.policy | 0 xmlgraphics-batik.slideshow.script | 35 - xmlgraphics-batik.spec | 258 ++----- xmlgraphics-batik.squiggle.script | 34 - xmlgraphics-batik.svgpp.script | 35 - xmlgraphics-batik.ttf2svg.script | 35 - 15 files changed, 82 insertions(+), 1165 deletions(-) create mode 100644 batik-build.tar.xz delete mode 100644 batik-src-1.10.tar.gz create mode 100644 batik-src-1.12.tar.gz delete mode 100644 xmlgraphics-batik-manifests.patch delete mode 100644 xmlgraphics-batik-policy.patch delete mode 100644 xmlgraphics-batik-securitymanager.patch delete mode 100644 xmlgraphics-batik-squiggle.desktop delete mode 100644 xmlgraphics-batik.rasterizer.script rename xmlgraphics-batik.rasterizer.policy => xmlgraphics-batik.security.policy (100%) delete mode 100644 xmlgraphics-batik.slideshow.script delete mode 100644 xmlgraphics-batik.squiggle.script delete mode 100644 xmlgraphics-batik.svgpp.script delete mode 100644 xmlgraphics-batik.ttf2svg.script diff --git a/batik-build.tar.xz b/batik-build.tar.xz new file mode 100644 index 0000000..8fe8512 --- /dev/null +++ b/batik-build.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2970d330a1aa891ea9d55f2b01eb76c620f5fec77e3618636e8a3dfc051644d3 +size 9104 diff --git a/batik-src-1.10.tar.gz b/batik-src-1.10.tar.gz deleted file mode 100644 index 2e70fd5..0000000 --- a/batik-src-1.10.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dfc4e76951e3d80e32deb708ba70ad45899345a66ee7fa5f1315905477bfd116 -size 16760550 diff --git a/batik-src-1.12.tar.gz b/batik-src-1.12.tar.gz new file mode 100644 index 0000000..e56a6a2 --- /dev/null +++ b/batik-src-1.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1236e7303e5880ed074222117ca70f0a0c2a249beac7f043a579de20aacc8bc +size 17751312 diff --git a/xmlgraphics-batik-manifests.patch b/xmlgraphics-batik-manifests.patch deleted file mode 100644 index 86e537c..0000000 --- a/xmlgraphics-batik-manifests.patch +++ /dev/null @@ -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 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - - - - -+ - - - -@@ -1316,6 +1332,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1341,6 +1368,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1365,6 +1403,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1393,6 +1442,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1404,6 +1464,65 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1436,6 +1555,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1456,6 +1586,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1484,6 +1625,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1517,6 +1669,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1539,6 +1702,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1550,6 +1724,33 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1559,6 +1760,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1579,6 +1791,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1600,6 +1823,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1619,6 +1853,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1638,6 +1883,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1650,6 +1906,31 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1658,6 +1939,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1677,6 +1969,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1699,6 +2002,17 @@ - - - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1729,14 +2043,17 @@ - - - -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1767,26 +2084,17 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1823,29 +2131,14 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1888,8 +2181,14 @@ - - - -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1935,28 +2234,14 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1996,8 +2281,14 @@ - - - -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -2033,8 +2324,17 @@ - - - -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -2052,34 +2352,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - diff --git a/xmlgraphics-batik-policy.patch b/xmlgraphics-batik-policy.patch deleted file mode 100644 index 1292571..0000000 --- a/xmlgraphics-batik-policy.patch +++ /dev/null @@ -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"; - }; -- diff --git a/xmlgraphics-batik-securitymanager.patch b/xmlgraphics-batik-securitymanager.patch deleted file mode 100644 index b21e219..0000000 --- a/xmlgraphics-batik-securitymanager.patch +++ /dev/null @@ -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. - } diff --git a/xmlgraphics-batik-squiggle.desktop b/xmlgraphics-batik-squiggle.desktop deleted file mode 100644 index 6aa03a8..0000000 --- a/xmlgraphics-batik-squiggle.desktop +++ /dev/null @@ -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; diff --git a/xmlgraphics-batik.changes b/xmlgraphics-batik.changes index b2d1b5a..8f3c795 100644 --- a/xmlgraphics-batik.changes +++ b/xmlgraphics-batik.changes @@ -1,7 +1,37 @@ +------------------------------------------------------------------- +Fri Apr 3 09:26:49 UTC 2020 - Fridrich Strba + +- 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 -- Mofified patch: +- Modified patch: * xmlgraphics-batik-manifests.patch + Extend the bundle manifest so that it is useful for eclipse diff --git a/xmlgraphics-batik.rasterizer.script b/xmlgraphics-batik.rasterizer.script deleted file mode 100644 index 23e98c3..0000000 --- a/xmlgraphics-batik.rasterizer.script +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# Batik SVG Rasterizer script -# JPackage Project - -# 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 "$@" diff --git a/xmlgraphics-batik.rasterizer.policy b/xmlgraphics-batik.security.policy similarity index 100% rename from xmlgraphics-batik.rasterizer.policy rename to xmlgraphics-batik.security.policy diff --git a/xmlgraphics-batik.slideshow.script b/xmlgraphics-batik.slideshow.script deleted file mode 100644 index e730552..0000000 --- a/xmlgraphics-batik.slideshow.script +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Batik SVG Slideshow script -# JPackage Project - -# 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 "$@" diff --git a/xmlgraphics-batik.spec b/xmlgraphics-batik.spec index 5316cce..e2afd44 100644 --- 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 'true' 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 diff --git a/xmlgraphics-batik.squiggle.script b/xmlgraphics-batik.squiggle.script deleted file mode 100644 index 8b434ac..0000000 --- a/xmlgraphics-batik.squiggle.script +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# Batik SVG Browser (Squiggle) script -# JPackage Project - -# 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 "$@" diff --git a/xmlgraphics-batik.svgpp.script b/xmlgraphics-batik.svgpp.script deleted file mode 100644 index fb0d60f..0000000 --- a/xmlgraphics-batik.svgpp.script +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Batik SVG Pretty Printer script -# JPackage Project - -# 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 "$@" diff --git a/xmlgraphics-batik.ttf2svg.script b/xmlgraphics-batik.ttf2svg.script deleted file mode 100644 index ee41cfe..0000000 --- a/xmlgraphics-batik.ttf2svg.script +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# -# Batik SVG Font Converter script -# JPackage Project - -# 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 "$@"