[apache-commons-collections] Drop tomcat5 subpackage.
Alexander Kurtakov
akurtakov at fedoraproject.org
Wed Mar 16 14:54:33 UTC 2011
commit ca16e9f5baed2b39b541e823c2082df026609acb
Author: Alexander Kurtakov <akurtako at redhat.com>
Date: Wed Mar 16 16:53:40 2011 +0200
Drop tomcat5 subpackage.
apache-commons-collections.spec | 52 +++++++-------------------------------
1 files changed, 10 insertions(+), 42 deletions(-)
---
diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index 66a58b0..cdf1c56 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -3,23 +3,21 @@
Name: apache-%{short_name}
Version: 3.2.1
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Provides new interfaces, implementations and utilities for Java Collections
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
-Source6: collections-tomcat5-build.xml
Patch0: jakarta-%{short_name}-javadoc-nonet.patch
Patch4: commons-collections-3.2-build_xml.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: java-devel
BuildRequires: jpackage-utils
-BuildRequires: maven2
+BuildRequires: maven
BuildRequires: maven-antrun-plugin
BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
@@ -43,6 +41,7 @@ Requires(postun): jpackage-utils
Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}-%{release}
+Obsoletes: %{name}-tomcat5 < %{version}-%{release}
%description
The introduction of the Collections API by Sun in JDK 1.2 has been a
@@ -80,15 +79,6 @@ Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release}
%description javadoc
%{summary}.
-%package tomcat5
-Summary: Jakarta Commons Collection dependency for Tomcat5
-Group: Development/Libraries
-Provides: jakarta-%{short_name}-tomcat5 = %{version}-%{release}
-Obsoletes: jakarta-%{short_name}-tomcat5 < %{version}-%{release}
-
-%description tomcat5
-A package that is specifically designed to fulfill to a Tomcat5 dependency.
-
%package testframework-javadoc
Summary: Javadoc for %{name}-testframework
Group: Documentation
@@ -107,7 +97,6 @@ find . -name "*.jar" -exec rm -f {} \;
%patch0 -p1
%patch4 -b .sav
-cp %{SOURCE6} .
# Fix file eof
%{__sed} -i 's/\r//' LICENSE.txt
@@ -118,34 +107,21 @@ cp %{SOURCE6} .
%build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-
-mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL install javadoc:javadoc
-
-export MAVEN_HOME_LOCAL=$(pwd)/.maven
+mvn-rpmbuild install javadoc:aggregate
ant tf.javadoc
-# commons-collections-tomcat5
-ant -f collections-tomcat5-build.xml
-
%install
-rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
-install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-install -m 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework-%{version}.jar
-
-# tomcat5
-install -m 644 collections-tomcat5/%{short_name}-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
+install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+install -m 644 target/%{short_name}-testframework-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-testframework.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
@@ -158,8 +134,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
cp -pr build/docs/testframework/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework-%{version}
ln -s %{name}-testframework-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}-testframework
-%clean
-rm -rf $RPM_BUILD_ROOT
%post
%update_maven_depmap
@@ -172,23 +146,14 @@ rm -rf $RPM_BUILD_ROOT
%doc PROPOSAL.html README.txt LICENSE.txt RELEASE-NOTES.html NOTICE.txt
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
-%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}.jar
-%{_javadir}/%{short_name}-%{version}.jar
%{_javadir}/%{short_name}.jar
%files testframework
%defattr(-,root,root,-)
-%{_javadir}/%{name}-testframework-%{version}.jar
%{_javadir}/%{name}-testframework.jar
-%{_javadir}/%{short_name}-testframework-%{version}.jar
%{_javadir}/%{short_name}-testframework.jar
-%files tomcat5
-%defattr(-,root,root,-)
-%{_javadir}/*-tomcat5*.jar
-%doc LICENSE.txt NOTICE.txt
-
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}-%{version}
@@ -200,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadocdir}/%{name}-testframework
%changelog
+* Wed Mar 16 2011 Alexander Kurtakov <akurtako at redhat.com> 3.2.1-10
+- Drop tomcat5 subpackage.
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list