[apache-commons-logging] Update to upstream version 1.1.2
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Mon Apr 8 04:28:25 UTC 2013
commit be4c09ab802e220162c7e6f04d7b72d61b1a514b
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon Apr 8 05:57:58 2013 +0200
Update to upstream version 1.1.2
- Convert POM to POM macros
- Remove OSGi manifest patch; fixed upstream
.gitignore | 1 +
apache-commons-logging.spec | 39 ++++++++++++++-----------------
commons-logging-avalon-update.patch | 29 -----------------------
commons-logging-eclipse-manifest.patch | 15 ------------
commons-logging.depmap | 12 ---------
sources | 2 +-
6 files changed, 20 insertions(+), 78 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1fa6e5f..8ea02b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
commons-logging-1.1.1-src.tar.gz
+/commons-logging-1.1.2-src.tar.gz
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index ef4dff5..70577f1 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -3,19 +3,15 @@
%global short_name commons-%{base_name}
Name: apache-%{short_name}
-Version: 1.1.1
-Release: 23%{?dist}
+Version: 1.1.2
+Release: 1%{?dist}
Summary: Apache Commons Logging
License: ASL 2.0
Group: Development/Libraries
URL: http://commons.apache.org/%{base_name}
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-Source1: %{short_name}.depmap
Source2: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{short_name}/%{short_name}-api/1.1/%{short_name}-api-1.1.pom
-# Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
-Patch0: %{short_name}-avalon-update.patch
-Patch1: %{short_name}-eclipse-manifest.patch
BuildArch: noarch
BuildRequires: maven-local
BuildRequires: java-devel >= 1:1.6.0
@@ -23,6 +19,8 @@ BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: avalon-framework >= 4.3
BuildRequires: avalon-logkit
BuildRequires: apache-commons-parent
+BuildRequires: maven-dependency-plugin
+BuildRequires: maven-failsafe-plugin
BuildRequires: maven-plugin-build-helper
BuildRequires: maven-release-plugin
BuildRequires: maven-site-plugin
@@ -61,24 +59,18 @@ Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.0.4
%prep
%setup -q -n %{short_name}-%{version}-src
-%patch0 -p1
-%patch1
+# 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 NOTICE.txt
+%pom_remove_plugin :cobertura-maven-plugin
+%pom_remove_plugin :maven-scm-publish-plugin
-# -----------------------------------------------------------------------------
+sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt NOTICE.txt
%build
-# fails with recent surefire for some reason
-rm src/test/org/apache/commons/logging/logkit/StandardTestCase.java
-rm src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java
-
-# These files have names suggesting they are test cases but they are not.
-# They should probably be renamed/excluded from surefire run properly
-rm src/test/org/apache/commons/logging/log4j/log4j12/*StandardTestCase.java
-
-mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" \
- install javadoc:aggregate
+mvn-rpmbuild install javadoc:aggregate
# -----------------------------------------------------------------------------
@@ -117,7 +109,7 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%files
%doc LICENSE.txt NOTICE.txt
-%doc PROPOSAL.html STATUS.html RELEASE-NOTES.txt
+%doc PROPOSAL.html RELEASE-NOTES.txt
%{_javadir}/*
%{_mavenpomdir}/JPP-%{short_name}.pom
%{_mavenpomdir}/JPP-%{short_name}-api.pom
@@ -131,6 +123,11 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%changelog
+* Mon Apr 8 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1.2-1
+- Update to upstream version 1.1.2
+- Convert POM to POM macros
+- Remove OSGi manifest patch; fixed upstream
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 315c692..513fce3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5cfa8cca13152d7545fde6b1783c60a commons-logging-1.1.1-src.tar.gz
+8928a44ded8fb362974fa303900773d6 commons-logging-1.1.2-src.tar.gz
More information about the scm-commits
mailing list