From 985c514154d798ad6ea380ff0cdc283e7c5676547d655bef627b8a75b8c68795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 15:05:15 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main xmlgraphics-commons revision 84e46757a4e8550758ed445a6dd913f0 --- xmlgraphics-commons.changes | 5 +++++ xmlgraphics-commons.spec | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/xmlgraphics-commons.changes b/xmlgraphics-commons.changes index 0bb4d99..888527f 100644 --- a/xmlgraphics-commons.changes +++ b/xmlgraphics-commons.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 14:31:28 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Wed Dec 28 12:37:08 UTC 2022 - Dirk Müller diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 6793c65..d10b1fb 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,7 +1,7 @@ # # spec file for package xmlgraphics-commons # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -32,9 +32,7 @@ BuildRequires: commons-io >= 1.1 BuildRequires: commons-logging BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local -Requires: mvn(commons-io:commons-io) >= 1.1 -Requires: mvn(commons-logging:commons-logging) +BuildRequires: javapackages-local >= 6 BuildArch: noarch %description @@ -55,8 +53,8 @@ Javadoc for package %{name}. %prep %setup -q %{name}-%{version} -%patch0 -%patch1 -p1 +%patch -P 0 +%patch -P 1 -p1 find . -name "*.jar" | xargs rm %build @@ -69,7 +67,8 @@ ant -Djavac.source=1.8 -Djavac.target=1.8 package javadocs install -Dpm 644 build/%{name}-%{version}.jar \ %{buildroot}%{_javadir}/%{name}.jar # pom -install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +install -dm 0755 %{buildroot}%{_mavenpomdir} +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar mkdir -p %{buildroot}%{_javadocdir}/%{name}