Accepting request 1205251 from Java:packages

Spec file cleanup

OBS-URL: https://build.opensuse.org/request/show/1205251
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glassfish-annotation-api?expand=0&rev=4
This commit is contained in:
Ana Guerrero 2024-10-03 16:00:17 +00:00 committed by Git OBS Bridge
commit c86b2155ff
2 changed files with 9 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Oct 2 15:40:10 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Spec file cleanup
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 18 19:04:27 UTC 2022 - Fridrich Strba <fstrba@suse.com> Fri Mar 18 19:04:27 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package glassfish-annotation-api # spec file for package glassfish-annotation-api
# #
# Copyright (c) 2022 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: https://raw.githubusercontent.com/javaee/%{groupId}/master/LICEN
BuildRequires: ant BuildRequires: ant
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
@ -49,10 +49,8 @@ This package contains javadoc for %{name}.
cp %{SOURCE1} build.xml cp %{SOURCE1} build.xml
cp %{SOURCE2} . cp %{SOURCE2} .
%pom_remove_parent .
%build %build
%{ant} ant
%install %install
# jar # jar
@ -60,7 +58,7 @@ install -dm 0755 %{buildroot}%{_javadir}
install -pm 0644 target/%{artifactId}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar install -pm 0644 target/%{artifactId}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# pom # pom
install -dm 0755 %{buildroot}%{_mavenpomdir} install -dm 0755 %{buildroot}%{_mavenpomdir}
install -pm 0644 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
install -dm 0755 %{buildroot}%{_javadocdir} install -dm 0755 %{buildroot}%{_javadocdir}