pool/apache-commons-logging
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=34

Browse Source
This commit is contained in:
Fridrich Strba 2018-10-19 20:36:10 +00:00 committed by Git OBS Bridge
parent 1479ff1576
commit 6fa70865f2
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache-commons-logging.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 19 20:35:40 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Cleanup of maven pom files installation
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 15 10:56:40 UTC 2018 - fstrba@suse.com Tue May 15 10:56:40 UTC 2018 - fstrba@suse.com

22
apache-commons-logging.spec
View File

@ -13,7 +13,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -64,11 +64,6 @@ logging implementation.
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
%pom_remove_dep :avalon-framework
%pom_add_dep avalon-framework:avalon-framework-api:4.3
%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
#FIXME #FIXME
@ -100,18 +95,21 @@ popd
# pom # pom
install -d -m 755 %{buildroot}%{_mavenpomdir} install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}.pom install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/%{short_name}.pom
install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/%{short_name}-api.pom
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-logging" %add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-logging"
%add_maven_depmap JPP-%{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api" %add_maven_depmap %{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api"
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt %doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
%{_javadir}/* %{_javadir}/*
%{_mavenpomdir}/JPP-%{short_name}.pom %{_mavenpomdir}/*
%{_mavenpomdir}/JPP-%{short_name}-api.pom %if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml* %{_datadir}/maven-metadata/%{name}.xml*
%endif
%changelog %changelog