From c03e2080aae52e964d20c67bb8e0f6947ff9cc8f20383791b7ce1709ae2be9cc Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:58:17 +0000 Subject: [PATCH] Accepting request 1114394 from Java:packages:test javapackages >= 6 OBS-URL: https://build.opensuse.org/request/show/1114394 OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-batik?expand=0&rev=57 --- xmlgraphics-batik.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xmlgraphics-batik.spec b/xmlgraphics-batik.spec index d76a0fe..c4ecb35 100644 --- a/xmlgraphics-batik.spec +++ b/xmlgraphics-batik.spec @@ -33,7 +33,7 @@ Patch0: %{name}-nolinksinjavadoc.patch Patch1: 0001-Fix-imageio-codec-lookup.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: rhino >= 1.6 BuildRequires: xml-commons-apis >= 1.3.03 BuildRequires: xmlgraphics-commons @@ -54,7 +54,6 @@ purposes, such as viewing, generation or manipulation. 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} @@ -217,15 +216,15 @@ ln -s %{name}-all.jar %{buildroot}%{_javadir}/batik-all.jar #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