Ana Guerrero 2024-02-20 20:15:16 +00:00 committed by Git OBS Bridge
commit 9c421fd069
3 changed files with 10 additions and 6 deletions

View File

@ -70,7 +70,6 @@
packagenames="*" packagenames="*"
destdir="${reporting.outputDirectory}/apidocs" destdir="${reporting.outputDirectory}/apidocs"
access="protected" access="protected"
old="false"
verbose="false" verbose="false"
encoding="iso-8859-1" encoding="iso-8859-1"
version="true" version="true"

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 20 10:25:28 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 21 05:39:25 UTC 2023 - Fridrich Strba <fstrba@suse.com> Thu Sep 21 05:39:25 UTC 2023 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-cli # spec file for package apache-commons-cli
# #
# 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
@ -31,7 +31,7 @@ Source2: apache-commons-cli-rpmlintrc
Patch0: CLI-253-workaround.patch Patch0: CLI-253-workaround.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
Provides: jakarta-%{short_name} = %{version}-%{release} Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}-%{release} Obsoletes: jakarta-%{short_name} < %{version}-%{release}
Provides: apache-cli = %{version}-%{release} Provides: apache-cli = %{version}-%{release}
@ -54,12 +54,12 @@ This package contains the API documentation for %{name}.
%prep %prep
%setup -q -n %{short_name}-%{version}-src %setup -q -n %{short_name}-%{version}-src
cp %{SOURCE1} build.xml cp %{SOURCE1} build.xml
%patch0 -p1 %patch -P 0 -p1
%pom_remove_parent %pom_remove_parent
%build %build
%ant package javadoc %{ant} package javadoc
%install %install
# jars # jars
@ -68,7 +68,7 @@ ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
# pom # pom
install -d -m 755 %{buildroot}%{_mavenpomdir} install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
%add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}" %add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
# javadoc # javadoc