Hello community, here is the log from the commit of package xmlgraphics-batik for openSUSE:Factory checked in at 2017-06-01 16:30:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlgraphics-batik (Old) and /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xmlgraphics-batik" Thu Jun 1 16:30:03 2017 rev:16 rq:496803 version:1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/xmlgraphics-batik/xmlgraphics-batik.changes 2017-04-12 18:25:24.299995693 +0200 +++ /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new/xmlgraphics-batik.changes 2017-06-01 16:30:09.880864545 +0200 @@ -1,0 +2,13 @@ +Fri May 19 15:45:22 UTC 2017 - tchvatal@suse.com + +- Version update to batik 1.9: + * No obvious upstream changelog +- Refresh patch xmlgraphics-batik-manifests.patch +- Refresh patch xmlgraphics-batik-policy.patch + +------------------------------------------------------------------- +Fri May 19 11:09:42 UTC 2017 - vsistek@suse.com + +- Add BuildRequires: javapackages-local (for maven conversions) + +------------------------------------------------------------------- Old: ---- batik-src-1.8.tar.gz New: ---- batik-src-1.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlgraphics-batik.spec ++++++ --- /var/tmp/diff_new_pack.Pi4Pq1/_old 2017-06-01 16:30:12.712465286 +0200 +++ /var/tmp/diff_new_pack.Pi4Pq1/_new 2017-06-01 16:30:12.716464722 +0200 @@ -18,7 +18,7 @@ Name: xmlgraphics-batik -Version: 1.8 +Version: 1.9 Release: 0 Summary: Scalable Vector Graphics for Java License: Apache-2.0 @@ -35,6 +35,8 @@ Patch1: %{name}-manifests.patch Patch2: %{name}-policy.patch BuildRequires: ant +# Needed for maven conversions +BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: jython BuildRequires: rhino >= 1.6 @@ -45,7 +47,6 @@ Requires: xml-commons-jaxp-1.3-apis >= 1.3.03 Obsoletes: batik < %{version}-%{release} Provides: batik = %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -57,7 +58,6 @@ Summary: Batik SVG browser Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools Requires: xerces-j2 >= 2.3 Obsoletes: batik-squiggle < %{version}-%{release} Provides: batik-squiggle = %{version}-%{release} @@ -70,7 +70,6 @@ Summary: Batik SVG pretty printer Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools Requires: xerces-j2 >= 2.3 Obsoletes: batik-svgpp < %{version}-%{release} Provides: batik-svgpp = %{version}-%{release} @@ -84,7 +83,6 @@ Summary: Batik SVG font converter Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools Obsoletes: batik-ttf2svg < %{version}-%{release} Provides: batik-ttf2svg = %{version}-%{release} @@ -98,7 +96,6 @@ Summary: Batik SVG rasterizer Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools Requires: xerces-j2 >= 2.3 Obsoletes: batik-rasterizer < %{version}-%{release} Provides: batik-rasterizer = %{version}-%{release} @@ -114,7 +111,6 @@ Summary: Batik SVG slideshow Group: Productivity/Graphics/Vector Editors Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools Requires: xerces-j2 >= 2.3 Obsoletes: batik-slideshow < %{version}-%{release} Provides: batik-slideshow = %{version}-%{release} @@ -137,9 +133,6 @@ %patch1 -p1 %patch2 -p1 -rm resources/org/apache/batik/ext/awt/image/codec/properties -rm test-resources/org/apache/batik/apps/rasterizer/readOnly.png - %build export CLASSPATH= export OPT_JAR_LIST=: @@ -188,7 +181,7 @@ # demo mkdir -p %{buildroot}%{_datadir}/%{name} -cp -pr contrib resources samples test-resources test-sources \ +cp -pr contrib samples test-resources test-sources \ %{buildroot}%{_datadir}/%{name} ln -s %{name} %{buildroot}%{_datadir}/batik ++++++ batik-src-1.8.tar.gz -> batik-src-1.9.tar.gz ++++++ /work/SRC/openSUSE:Factory/xmlgraphics-batik/batik-src-1.8.tar.gz /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new/batik-src-1.9.tar.gz differ: char 16, line 1 ++++++ xmlgraphics-batik-manifests.patch ++++++ --- /var/tmp/diff_new_pack.Pi4Pq1/_old 2017-06-01 16:30:12.776456262 +0200 +++ /var/tmp/diff_new_pack.Pi4Pq1/_new 2017-06-01 16:30:12.776456262 +0200 @@ -1,16 +1,8 @@ -Index: batik-1.8/build.xml +Index: batik-1.9/build.xml =================================================================== ---- batik-1.8.orig/build.xml -+++ batik-1.8/build.xml -@@ -639,7 +639,6 @@ JAVA=/usr/bin/java - <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="${project}-svggen-${completeVersion}.jar ${project}-util-${completeVersion}.jar"/> - </manifest> - <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> - <fileset dir="${dest}"> -@@ -1535,14 +1534,6 @@ JAVA=/usr/bin/java +--- batik-1.9.orig/build.xml ++++ batik-1.9/build.xml +@@ -1729,14 +1729,6 @@ JAVA=/usr/bin/java <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Build-Id" value="${build.id}"/> <attribute name="Main-Class" value="org.apache.batik.apps.svgpp.Main"/> @@ -25,7 +17,7 @@ </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> <fileset dir="${dest}"> -@@ -1573,26 +1564,6 @@ JAVA=/usr/bin/java +@@ -1767,26 +1759,6 @@ JAVA=/usr/bin/java <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Build-Id" value="${build.id}"/> <attribute name="Main-Class" value="org.apache.batik.apps.slideshow.Main"/> @@ -52,10 +44,10 @@ </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> <fileset dir="${dest}"> -@@ -1629,29 +1600,6 @@ JAVA=/usr/bin/java - <attribute name="Implementation-Version" value="${completeVersion}"/> +@@ -1823,29 +1795,6 @@ JAVA=/usr/bin/java <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" /> @@ -79,10 +71,10 @@ - <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="Build-Id" value="${build.id}"/> </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> -@@ -1698,8 +1646,6 @@ JAVA=/usr/bin/java + <fileset dir="${dest}"> +@@ -1888,8 +1837,6 @@ JAVA=/usr/bin/java <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Build-Id" value="${build.id}"/> <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main"/> @@ -90,8 +82,8 @@ - <attribute name="Class-Path" value="${jarsLibDir}${project}-${project}-extension-${completeVersion}.ja" /> </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> - <fileset dir="${resources}" excludes="**/.svn/"> -@@ -1734,28 +1680,6 @@ JAVA=/usr/bin/java + <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/"> +@@ -1935,28 +1882,6 @@ JAVA=/usr/bin/java <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Main-Class" value="org.apache.batik.apps.rasterizer.Main" /> <attribute name="Build-Id" value="${build.id}"/> @@ -120,16 +112,16 @@ </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> <fileset dir="${dest}"> -@@ -1795,8 +1719,6 @@ JAVA=/usr/bin/java - <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" /> - </manifest> +@@ -1996,8 +1921,6 @@ JAVA=/usr/bin/java + <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" /> + </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> - <fileset dir="${resources}" excludes="**/.svn/"> -@@ -1822,8 +1744,6 @@ JAVA=/usr/bin/java + <fileset dir="batik-svgbrowser/src/main/resources" excludes="**/.svn/"> +@@ -2033,8 +1956,6 @@ JAVA=/usr/bin/java <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Build-Id" value="${build.id}"/> <attribute name="Main-Class" value="org.apache.batik.apps.ttf2svg.Main"/> @@ -138,7 +130,7 @@ </manifest> <metainf dir="${basedir}" includes="LICENSE,NOTICE"/> <fileset dir="${dest}"> -@@ -1841,34 +1761,6 @@ JAVA=/usr/bin/java +@@ -2052,34 +1973,6 @@ JAVA=/usr/bin/java <attribute name="Implementation-Vendor" value="${vendor}"/> <attribute name="Build-Id" value="${build.id}"/> <attribute name="Main-Class" value="org.apache.batik.apps.svgbrowser.Main" /> @@ -163,8 +155,8 @@ - <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/xerces_2_5_0.jar" /> -- <attribute name="Class-Path" value="lib/xalan-2.7.0.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" /> ++++++ xmlgraphics-batik-policy.patch ++++++ --- /var/tmp/diff_new_pack.Pi4Pq1/_old 2017-06-01 16:30:12.792454007 +0200 +++ /var/tmp/diff_new_pack.Pi4Pq1/_new 2017-06-01 16:30:12.792454007 +0200 @@ -1,7 +1,7 @@ -Index: batik-1.8/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy +Index: batik-1.8/batik-svgrasterizer/src/main/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy =================================================================== ---- batik-1.8.orig/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy -+++ batik-1.8/resources/org/apache/batik/apps/rasterizer/resources/rasterizer.bin.policy +--- batik-1.8.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; }; @@ -14,10 +14,10 @@ grant codeBase "${app.jar.base}/lib/batik-ext.jar" { permission java.security.AllPermission; }; -Index: batik-1.8/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy +Index: batik-1.8/batik-svgbrowser/src/main/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy =================================================================== ---- batik-1.8.orig/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy -+++ batik-1.8/resources/org/apache/batik/apps/svgbrowser/resources/svgbrowser.bin.policy +--- batik-1.8.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; };