1
0

Accepting request 1148443 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148443
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/beust-jcommander?expand=0&rev=4
This commit is contained in:
Ana Guerrero 2024-02-21 16:58:19 +00:00 committed by Git OBS Bridge
commit 6d27f9d751
2 changed files with 9 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 21 08:20:16 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 3 09:07:55 UTC 2023 - Fridrich Strba <fstrba@suse.com> Wed May 3 09:07:55 UTC 2023 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file # spec file for package beust-jcommander
# #
# 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
@ -51,15 +51,13 @@ This package contains the %{summary}.
%prep %prep
%setup -q -n %{short_name}-%{version} %setup -q -n %{short_name}-%{version}
%patch0 -p1 %patch -P 0 -p1
chmod -x license.txt chmod -x license.txt
cp -p %{SOURCE1} pom.xml cp -p %{SOURCE1} pom.xml
cp -p %{SOURCE2} build.xml cp -p %{SOURCE2} build.xml
sed -i 's/@VERSION@/%{version}/g' pom.xml build.xml sed -i 's/@VERSION@/%{version}/g' pom.xml build.xml
%pom_remove_parent .
%build %build
%{ant} jar javadoc %{ant} jar javadoc
@ -71,7 +69,7 @@ install -m 644 target/%{short_name}-%{version}.jar \
# pom # pom
install -d -m 755 %{buildroot}%{_mavenpomdir} install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar %add_maven_depmap %{name}.pom %{name}.jar
# javadoc # javadoc