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

Update to upstream version 1.1.2

Browse Source 
- Convert POM to POM macros
- Remove OSGi manifest patch; fixed upstream
This commit is contained in:
Mikolaj Izdebski 2013-04-08 05:57:58 +02:00
parent a4b1e1e6d9
commit be4c09ab80
6 changed files with 20 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1 +1,2 @@
commons-logging-1.1.1-src.tar.gz
/commons-logging-1.1.2-src.tar.gz

39
apache-commons-logging.spec
View File

@ -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
%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@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@lists.fedoraproject.org> - 1.1.1-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

29
commons-logging-avalon-update.patch
View File

@ -1,29 +0,0 @@
diff --git a/pom.xml b/pom.xml
index 8efaf6d..24dc9fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -472,8 +472,15 @@ under the License.
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
- <artifactId>avalon-framework</artifactId>
- <version>4.1.3</version>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.3</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.3</version>
+ <scope>test</scope>
<optional>true</optional>
</dependency>
<dependency>
@@ -520,4 +527,4 @@ under the License.
<maven.compile.source>1.2</maven.compile.source>
<maven.compile.target>1.1</maven.compile.target>
</properties>
-</project>
\ No newline at end of file
+</project>

15
commons-logging-eclipse-manifest.patch
View File

@ -1,15 +0,0 @@
--- src/conf/MANIFEST.MF.orig 2007-11-22 01:27:52.000000000 +0200
+++ src/conf/MANIFEST.MF 2010-06-09 21:04:06.532857757 +0300
@@ -6,3 +6,12 @@ Implementation-Title: Commons Logging
Implementation-Vendor-Id: org.apache
Implementation-Vendor: Apache Software Foundation
Implementation-Version: 1.1.1
+Bundle-ManifestVersion: 2
+Export-Package: org.apache.commons.logging;version="1.1.1",org.apache.
+ commons.logging.impl;version="1.1.1"
+Bundle-Version: 1.1.1.v20080605-1930
+Bundle-SymbolicName: org.apache.commons.logging
+Bundle-Name: Apache Commons Logging Plug-in
+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
+Bundle-Localization: plugin
+Bundle-Vendor: Apache Software Foundation

12
commons-logging.depmap
View File

@ -1,12 +0,0 @@
<dependencies>
<dependency>
<maven>
<groupId>xerces</groupId>
<artifactId>xerces</artifactId>
</maven>
<jpp>
<groupId>JPP</groupId>
<artifactId>xerces-j2</artifactId>
</jpp>
</dependency>
</dependencies>

2
sources
View File

@ -1 +1 @@
e5cfa8cca13152d7545fde6b1783c60a commons-logging-1.1.1-src.tar.gz
8928a44ded8fb362974fa303900773d6 commons-logging-1.1.2-src.tar.gz