Accepting request 1205268 from Java:packages

Spec file cleanup

OBS-URL: https://build.opensuse.org/request/show/1205268
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jline?expand=0&rev=28
This commit is contained in:
Ana Guerrero 2024-10-03 16:00:23 +00:00 committed by Git OBS Bridge
commit 42fc997a8e
2 changed files with 8 additions and 16 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 2 15:53:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Spec file cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 20 14:38:17 UTC 2024 - Fridrich Strba <fstrba@suse.com> Tue Feb 20 14:38:17 UTC 2024 - Fridrich Strba <fstrba@suse.com>

View File

@ -30,7 +30,7 @@ Patch1: jline-jansi2.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: jansi BuildRequires: jansi
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
#!BuildIgnore: ant-antlr #!BuildIgnore: ant-antlr
BuildArch: noarch BuildArch: noarch
@ -55,22 +55,9 @@ This package contains the API documentation for %{name}.
cp %{SOURCE1} build.xml cp %{SOURCE1} build.xml
mkdir -p lib mkdir -p lib
# Remove maven-shade-plugin usage
%pom_remove_plugin "org.apache.maven.plugins:maven-shade-plugin"
# Remove animal sniffer plugin in order to reduce deps
%pom_remove_plugin "org.codehaus.mojo:animal-sniffer-maven-plugin"
# Remove unavailable and unneeded deps
%pom_xpath_remove "pom:build/pom:extensions"
%pom_remove_plugin :maven-site-plugin
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :maven-javadoc-plugin
%pom_remove_parent
%build %build
build-jar-repository -s lib jansi build-jar-repository -s lib jansi
%{ant} package javadoc ant package javadoc
%install %install
# jar # jar
@ -78,7 +65,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name}
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %{mvn_install_pom} pom.xml %{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}