commit 7e7d17b790b3fff02248061592cad66c278dd9b8
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Mon Apr 30 17:30:00 2012 +0300
Fix build with latest libs.
- Adapt to current guidelines.
apache-commons-logging.spec | 33 ++++++----------------------
commons-logging-maven-release-plugin.patch | 33 ----------------------------
commons-logging.depmap | 28 ++---------------------
3 files changed, 10 insertions(+), 84 deletions(-)
---
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 4e8b467..4300cd6 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.1.1
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: Apache Commons Logging
License: ASL 2.0
Group: Development/Libraries
@@ -26,16 +26,10 @@ BuildRequires: apache-commons-parent
BuildRequires: maven-plugin-build-helper
BuildRequires: maven-release-plugin
BuildRequires: maven-site-plugin
-BuildRequires: servlet25
+BuildRequires: servlet
Requires: java >= 1:1.6.0
Requires: jpackage-utils >= 0:1.6
-Requires(post): jpackage-utils
-Requires(postun):jpackage-utils
-
-# This should go away with F-17
-Provides: jakarta-%{short_name} = 0:%{version}-%{release}
-Obsoletes: jakarta-%{short_name} <= 0:1.0.4
%description
The commons-logging package provides a simple, component oriented
@@ -79,7 +73,7 @@ rm
src/test/org/apache/commons/logging/servlet/BasicServletTestCase.java
# They should probably be renamed/excluded from surefire run properly
rm src/test/org/apache/commons/logging/log4j/log4j12/*StandardTestCase.java
-mvn-rpmbuild -X -Dmaven.local.depmap.file="%{SOURCE1}" \
+mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" \
install javadoc:aggregate
# -----------------------------------------------------------------------------
@@ -117,23 +111,7 @@ install -pm 644 %{SOURCE2}
$RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}-api
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-# -----------------------------------------------------------------------------
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-
-# -----------------------------------------------------------------------------
-
%files
-%defattr(-,root,root,-)
%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt
%{_javadir}/*
%{_mavenpomdir}/JPP-%{short_name}.pom
@@ -142,13 +120,16 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name}
|| :
%files javadoc
-%defattr(-,root,root,-)
%doc LICENSE.txt
%{_javadocdir}/%{name}
# -----------------------------------------------------------------------------
%changelog
+* Mon Apr 30 2012 Alexander Kurtakov <akurtako(a)redhat.com> 1.1.1-18
+- Fix build with latest libs.
+- Adapt to current guidelines.
+
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> -
1.1.1-17
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/commons-logging.depmap b/commons-logging.depmap
index 1059072..922cda5 100644
--- a/commons-logging.depmap
+++ b/commons-logging.depmap
@@ -1,34 +1,12 @@
<dependencies>
<dependency>
<maven>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
</maven>
<jpp>
<groupId>JPP</groupId>
- <artifactId>tomcat6-servlet-2.5-api</artifactId>
+ <artifactId>xerces-j2</artifactId>
</jpp>
</dependency>
- <dependency>
- <maven>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- </maven>
- <jpp>
- <groupId>JPP</groupId>
- <artifactId>tomcat6-servlet-2.5-api</artifactId>
- </jpp>
- </dependency>
- <dependency>
- <maven>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-javamail</artifactId>
- </maven>
- </dependency>
- <dependency>
- <maven>
- <groupId>geronimo-spec</groupId>
- <artifactId>geronimo-spec-jms</artifactId>
- </maven>
- </dependency>
</dependencies>