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

Use log4j12

Browse Source 
- Add avalon conditional
This commit is contained in:
Michael Simacek 2017-02-10 13:56:57 +01:00
parent 44d3220af2
commit cfe1c2b070
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apache-commons-logging.spec
View File

@ -1,13 +1,11 @@
# READ BEFORE UPDATING: After updating this package to new upstream %bcond_without avalon
# version eclipse-ecf should be rebuilt. For more info, see:
# https://fedoraproject.org/wiki/SIGs/Java#Package_Update.2FRebuild_Notes
%global base_name logging %global base_name logging
%global short_name commons-%{base_name} %global short_name commons-%{base_name}
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 1.2 Version: 1.2
Release: 7%{?dist} Release: 8%{?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}
@ -18,12 +16,14 @@ Patch0: 0001-Generate-different-Bundle-SymbolicName-for-different.patch
Patch1: 0002-Port-to-maven-jar-plugin-3.0.0.patch Patch1: 0002-Port-to-maven-jar-plugin-3.0.0.patch
BuildRequires: maven-local BuildRequires: maven-local
%if %{with avalon}
BuildRequires: mvn(avalon-framework:avalon-framework-api) BuildRequires: mvn(avalon-framework:avalon-framework-api)
BuildRequires: mvn(avalon-framework:avalon-framework-impl) BuildRequires: mvn(avalon-framework:avalon-framework-impl)
BuildRequires: mvn(logkit:logkit)
%endif
BuildRequires: mvn(javax.servlet:servlet-api) BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(log4j:log4j) BuildRequires: mvn(log4j:log4j:12)
BuildRequires: mvn(logkit:logkit)
BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.commons:commons-parent:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
@ -56,10 +56,17 @@ Summary: API documentation for %{name}
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%if %{with avalon}
# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143 # Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
%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
%else
%pom_remove_dep :avalon-framework
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/LogKitLogger.java
%endif
%pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>' %pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
@ -110,6 +117,10 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
%changelog %changelog
* Fri Feb 10 2017 Michael Simacek <msimacek@redhat.com> - 1.2-8
- Use log4j12
- Add avalon conditional
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild