Fix build with latest libs.
- Adapt to current guidelines.
This commit is contained in:
Alexander Kurtakov
parent
8474551cd6
commit
7e7d17b790
@ -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@redhat.com> 1.1.1-18
|
||||
- Fix build with latest libs.
|
||||
- Adapt to current guidelines.
|
||||
|
||||
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.1-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 8efaf6d..4b3e8f9 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -308,21 +308,6 @@ under the License.
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
- <groupId>org.apache.maven.plugins</groupId>
|
||||
- <artifactId>maven-release-plugin</artifactId>
|
||||
- <version>2.0-beta-6</version>
|
||||
- <configuration>
|
||||
- <!--
|
||||
- - The site needs to be built prior to deploy,
|
||||
- - because it is included in the assembly.
|
||||
- -->
|
||||
- <goals>site deploy</goals>
|
||||
- <!-- Pass these arguments to the deploy plugin. -->
|
||||
- <arguments>-Prelease</arguments>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
-
|
||||
- <plugin>
|
||||
<!--
|
||||
- Many of JCL's tests use tricky techniques to place the generated
|
||||
- JCL jarfiles on the classpath in various configurations. This means
|
||||
@@ -520,4 +505,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>
|
||||
@ -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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user