Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xmlgraphics-batik for
openSUSE:Factory checked in at 2023-10-27 22:27:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlgraphics-batik (Old)
and /work/SRC/openSUSE:Factory/.xmlgraphics-batik.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-batik"
Fri Oct 27 22:27:05 2023 rev:29 rq:1120326 version:1.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlgraphics-batik/xmlgraphics-batik.changes
2023-06-29 17:27:55.218115897 +0200
+++
/work/SRC/openSUSE:Factory/.xmlgraphics-batik.new.17445/xmlgraphics-batik.changes
2023-10-27 22:27:07.705171364 +0200
@@ -1,0 +2,8 @@
+Wed Oct 25 15:07:46 UTC 2023 - Fridrich Strba <fst...@suse.com>
+
+- Build with source and target levels 8
+- Added patch:
+ * xmlgraphics-batik-nosourcetarget.patch
+ + do not hardcode source/target 1.7
+
+-------------------------------------------------------------------
New:
----
xmlgraphics-batik-nosourcetarget.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlgraphics-batik.spec ++++++
--- /var/tmp/diff_new_pack.Os2bbR/_old 2023-10-27 22:27:08.941216697 +0200
+++ /var/tmp/diff_new_pack.Os2bbR/_new 2023-10-27 22:27:08.941216697 +0200
@@ -31,9 +31,11 @@
Source7: %{name}.security.policy
Patch0: %{name}-nolinksinjavadoc.patch
Patch1: 0001-Fix-imageio-codec-lookup.patch
+Patch2: %{name}-nosourcetarget.patch
BuildRequires: ant
BuildRequires: fdupes
-BuildRequires: javapackages-local
+BuildRequires: java-devel >= 1.8
+BuildRequires: javapackages-local >= 6
BuildRequires: rhino >= 1.6
BuildRequires: xml-commons-apis >= 1.3.03
BuildRequires: xmlgraphics-commons
@@ -54,7 +56,6 @@
Summary: Batik CSS engine
Group: Productivity/Graphics/Vector Editors
Requires: %{name} = %{version}-%{release}
-Requires: mvn(xml-apis:xml-apis-ext)
Obsoletes: batik-css < %{version}-%{release}
Provides: batik-css = %{version}-%{release}
@@ -148,6 +149,7 @@
%patch0 -p1
%patch1 -p1
+%patch2 -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
@@ -189,7 +191,7 @@
-f build-batik.xml -Dtest.skip=true \
package
%{ant} \
- -Dant.build.javac.source=7 -Dant.build.javac.target=7 \
+ -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
all-jar jars javadoc
%install
@@ -217,15 +219,15 @@
#pom
mkdir -p %{buildroot}%{_mavenpomdir}/%{name}
-cp -p pom.xml %{buildroot}%{_mavenpomdir}/%{name}/parent.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/parent.pom
%add_maven_depmap %{name}/parent.pom
-cp -p batik-all/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-all.pom
+%{mvn_install_pom} batik-all/pom.xml
%{buildroot}%{_mavenpomdir}/%{name}-all.pom
%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 shared-resources svg-dom svgbrowser svggen svgrasterizer swing
transcoder util gui-util xml;
do
- cp -p batik-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
+ %{mvn_install_pom} batik-${i}/pom.xml
%{buildroot}%{_mavenpomdir}/%{name}/${i}.pom
%add_maven_depmap %{name}/${i}.pom %{name}/${i}.jar
done
++++++ xmlgraphics-batik-nosourcetarget.patch ++++++
--- batik-1.15/build.xml 2023-10-25 17:01:52.414466777 +0200
+++ batik-1.15/build.xml 2023-10-25 17:03:22.921750305 +0200
@@ -94,8 +94,6 @@
<property name="debug" value="on"/>
<property name="optimize" value="on"/>
<property name="deprecation" value="on"/>
- <property name="javac.source" value="1.7"/>
- <property name="javac.target" value="1.7"/>
<property name="src" value="sources"/>
<property name="src-internal-codec" value="sources-internal-codec"/>
<property name="resources" value="resources"/>
@@ -712,7 +710,7 @@
<echo message="debug ${debug}, optimize ${optimize}, deprecation
${deprecation}"/>
- <javac source="${javac.source}" target="${javac.target}" destdir="${dest}"
deprecation="${deprecation}"
+ <javac destdir="${dest}" deprecation="${deprecation}"
debug="${debug}" optimize="${optimize}" encoding="UTF-8">
<src path="${testsrc}"/>
<src path="batik-test/src/main/java"/>
@@ -743,7 +741,7 @@
<echo message="debug ${debug}, optimize ${optimize}, deprecation
${deprecation}"/>
- <javac source="${javac.source}" target="${javac.target}"
srcdir="${samples}/tests/resources/java/sources"
destdir="${samples}/tests/resources/java/classes" deprecation="${deprecation}"
+ <javac srcdir="${samples}/tests/resources/java/sources"
destdir="${samples}/tests/resources/java/classes" deprecation="${deprecation}"
debug="${debug}" optimize="${optimize}" encoding="UTF-8">
<classpath>
<pathelement location="${dest}"/>
@@ -753,7 +751,7 @@
</classpath>
</javac>
- <javac source="${javac.source}" target="${javac.target}"
srcdir="${testresources}" destdir="${testresources}/classes"
deprecation="${deprecation}"
+ <javac srcdir="${testresources}" destdir="${testresources}/classes"
deprecation="${deprecation}"
debug="${debug}" optimize="${optimize}" encoding="UTF-8">
<classpath>
<pathelement location="${dest}"/>
@@ -999,7 +997,7 @@
</target>
<target name="compile" depends="init, compile-prepare,
compile-copy-resources" unless="compile.done">
- <javac source="${javac.source}" target="${javac.target}" destdir="${dest}"
deprecation="${deprecation}"
+ <javac destdir="${dest}" deprecation="${deprecation}"
debug="${debug}" optimize="${optimize}" encoding="UTF-8"
includeAntRuntime="true">
<src path="batik-anim/src/main/java"/>
