Compare commits

..

No commits in common. "c8-stream-3.5" and "c8-stream-201902" have entirely different histories.

View File

@ -1,8 +1,6 @@
%bcond_without avalon
Name: apache-commons-logging Name: apache-commons-logging
Version: 1.2 Version: 1.2
Release: 13%{?dist} Release: 15%{?dist}
Summary: Apache Commons Logging Summary: Apache Commons Logging
License: ASL 2.0 License: ASL 2.0
URL: http://commons.apache.org/logging URL: http://commons.apache.org/logging
@ -15,11 +13,6 @@ 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-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:12) BuildRequires: mvn(log4j:log4j:12)
@ -39,25 +32,17 @@ commons-logging abstraction is meant to minimize the differences between
the two, and to allow a developer to not tie himself to a particular the two, and to allow a developer to not tie himself to a particular
logging implementation. logging implementation.
%{?module_package}
%{?javadoc_package} %{?javadoc_package}
%prep %prep
%autosetup -p1 -n commons-logging-%{version}-src %autosetup -p1 -n commons-logging-%{version}-src
%if %{with avalon}
# 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:provided
%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
%pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
%else
%pom_remove_dep -r :avalon-framework %pom_remove_dep -r :avalon-framework
%pom_remove_dep -r :logkit %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
%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
@ -72,7 +57,8 @@ sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12 rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
%build %build
%mvn_build # Test failures, need to investigate and fix them
%mvn_build -f -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6
# The build produces more artifacts from one pom # The build produces more artifacts from one pom
%mvn_artifact %{SOURCE2} target/commons-logging-%{version}-api.jar %mvn_artifact %{SOURCE2} target/commons-logging-%{version}-api.jar
@ -81,11 +67,17 @@ rm -rf src/test/java/org/apache/commons/logging/log4j/log4j12
%install %install
%mvn_install %mvn_install
%files -f .mfiles %files -n %{?module_prefix}%{name} -f .mfiles
%license LICENSE.txt NOTICE.txt %license LICENSE.txt NOTICE.txt
%doc PROPOSAL.html RELEASE-NOTES.txt %doc PROPOSAL.html RELEASE-NOTES.txt
%changelog %changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-15
- Mass rebuild for javapackages-tools 201902
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-14
- Mass rebuild for javapackages-tools 201901
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild