1
0
forked from pool/avalon-logkit

Accepting request 1108213 from Java:packages

Cleanup

OBS-URL: https://build.opensuse.org/request/show/1108213
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/avalon-logkit?expand=0&rev=21
This commit is contained in:
Ana Guerrero 2023-09-01 12:18:43 +00:00 committed by Git OBS Bridge
commit a7588a1f4b
2 changed files with 9 additions and 11 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Aug 31 07:59:59 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Clean the spec file and use the new %%mvn_install_pom
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 22 19:24:57 UTC 2022 - Fridrich Strba <fstrba@suse.com> Tue Feb 22 19:24:57 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package avalon-logkit # spec file for package avalon-logkit
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# Copyright (c) 2000-2005, JPackage Project # Copyright (c) 2000-2005, JPackage Project
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -41,14 +41,10 @@ BuildRequires: geronimo-jms-1_1-api
BuildRequires: glassfish-servlet-api BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javamail BuildRequires: javamail
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
BuildRequires: jdbc-stdext BuildRequires: jdbc-stdext
BuildRequires: reload4j BuildRequires: reload4j
BuildRequires: unzip BuildRequires: unzip
Requires: mvn(javax.jms:jms)
Requires: mvn(javax.mail:mail)
Requires: mvn(javax.servlet:servlet-api)
Requires: mvn(log4j:log4j)
BuildArch: noarch BuildArch: noarch
%description %description
@ -96,7 +92,7 @@ install -m 644 target/%{name}-%{version}.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}/JPP-%{name}.pom %mvn_install_pom pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name},org.apache.avalon.logkit:%{name}" %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name},org.apache.avalon.logkit:%{name}"
# javadoc # javadoc
@ -104,11 +100,8 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name}
%files %files -f .mfiles
%doc LICENSE.txt NOTICE.txt %doc LICENSE.txt NOTICE.txt
%{_javadir}/*
%{_datadir}/maven-metadata/%{name}.xml
%{_mavenpomdir}/JPP-%{name}.pom
%files javadoc %files javadoc
%doc LICENSE.txt %doc LICENSE.txt