Accepting request 1148663 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148663
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jdom2?expand=0&rev=6
This commit is contained in:
Ana Guerrero 2024-02-22 19:56:08 +00:00 committed by Git OBS Bridge
commit 63a2b4f466
2 changed files with 9 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 21 11:54:11 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 23 14:59:34 UTC 2023 - Fridrich Strba <fstrba@suse.com> Wed Aug 23 14:59:34 UTC 2023 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package jdom2 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -29,7 +29,7 @@ BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildArch: noarch BuildArch: noarch
%description %description
@ -51,7 +51,7 @@ This package contains javadoc for %{name}.
%prep %prep
%setup -q -n jdom-%{version} %setup -q -n jdom-%{version}
%patch0 -p1 %patch -P 0 -p1
sed -i 's/\r//' LICENSE.txt 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 install -pm 0644 build/package/jdom-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} 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 %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
# javadoc # javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name} install -dm 0755 %{buildroot}%{_javadocdir}/%{name}