From f97f72c3a74890bc77f5978bdbcce03076a8ba98912e6282f7abcb39c95cbf7b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:58:40 +0000 Subject: [PATCH 1/2] Accepting request 1114393 from Java:packages:test javapackages >= 6 OBS-URL: https://build.opensuse.org/request/show/1114393 OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-commons?expand=0&rev=59 --- xmlgraphics-commons.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 6793c65..433b466 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) 2023 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 @@ -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} From 72536305718e557116dde2d62f867c156fc33669ecef362677e4f3b433ed0e54 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 14:31:38 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-commons?expand=0&rev=60 --- xmlgraphics-commons.changes | 5 +++++ xmlgraphics-commons.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 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 433b466..d10b1fb 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,7 +1,7 @@ # # spec file for package xmlgraphics-commons # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -53,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