rpms/apache-commons-logging
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix conditional

Browse Source
This commit is contained in:
Michael Simacek 2017-02-13 11:01:59 +01:00
parent cfe1c2b070
commit 28f0ca738b
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apache-commons-logging.spec
View File

@ -5,7 +5,7 @@
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 1.2 Version: 1.2
Release: 8%{?dist} Release: 9%{?dist}
Summary: Apache Commons Logging Summary: Apache Commons Logging
License: ASL 2.0 License: ASL 2.0
URL: http://commons.apache.org/%{base_name} URL: http://commons.apache.org/%{base_name}
@ -61,15 +61,16 @@ Summary: API documentation for %{name}
%pom_remove_dep :avalon-framework %pom_remove_dep :avalon-framework
%pom_add_dep avalon-framework:avalon-framework-api:4.3:provided %pom_add_dep avalon-framework:avalon-framework-api:4.3:provided
%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test %pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
%pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
%else %else
%pom_remove_dep :avalon-framework %pom_remove_dep -r :avalon-framework
%pom_remove_dep -r :logkit
rm -r src/test/java/org/apache/commons/logging/{avalon,logkit} rm -r src/test/java/org/apache/commons/logging/{avalon,logkit}
rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java
rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java
%endif %endif
%pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
%pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :cobertura-maven-plugin
%pom_remove_plugin :maven-scm-publish-plugin %pom_remove_plugin :maven-scm-publish-plugin
@ -117,6 +118,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Mon Feb 13 2017 Michael Simacek <msimacek@redhat.com> - 1.2-9
- Fix conditional
* Fri Feb 10 2017 Michael Simacek <msimacek@redhat.com> - 1.2-8 * Fri Feb 10 2017 Michael Simacek <msimacek@redhat.com> - 1.2-8
- Use log4j12 - Use log4j12
- Add avalon conditional - Add avalon conditional