From 4e18762df49945e8cb3552076fccef897f08294ed5ab023a7fc7410762c6f4f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 14:43:53 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main jdom2 revision 25a8a299aef09e94145ce40465ae9eea --- jdom2.changes | 5 +++++ jdom2.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jdom2.changes b/jdom2.changes index f0a4eb2..eecc5bd 100644 --- a/jdom2.changes +++ b/jdom2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 11:54:11 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Wed Aug 23 14:59:34 UTC 2023 - Fridrich Strba diff --git a/jdom2.spec b/jdom2.spec index 0ca5d76..77bf2c4 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,7 +1,7 @@ # # spec file for package jdom2 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,7 @@ BuildRequires: ant BuildRequires: ant-junit BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildArch: noarch %description @@ -51,7 +51,7 @@ This package contains javadoc for %{name}. %prep %setup -q -n jdom-%{version} -%patch0 -p1 +%patch -P 0 -p1 sed -i 's/\r//' LICENSE.txt @@ -72,7 +72,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name} install -pm 0644 build/package/jdom-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 build/maven/core/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%{mvn_install_pom} build/maven/core/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}