SPECS: java-commons-collections.spec, jakarta-commons-collections.spec (REM...

[glen]

Author: glen                         Date: Sun Nov 23 23:27:15 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- renamed to java-commons-collections.spec

---- Files affected:
SPECS:
   java-commons-collections.spec (1.25 -> 1.26) , jakarta-commons-collections.spec (1.25 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SPECS/java-commons-collections.spec
diff -u SPECS/java-commons-collections.spec:1.25 SPECS/java-commons-collections.spec:1.26
--- SPECS/java-commons-collections.spec:1.25	Mon Jan 14 20:49:06 2008
+++ SPECS/java-commons-collections.spec	Mon Nov 24 00:27:09 2008
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
-# TODO
-# - rename to apache-commons-collections?
+#
+# Conditional build:
+%bcond_without	javadoc		# don't build javadoc
+
 %include	/usr/lib/rpm/macros.java
 Summary:	Commons Collections - Java Collections enhancements
 Summary(pl.UTF-8):	Commons Collections - rozszerzenia Java Collections
@@ -8,17 +10,19 @@
 Version:	3.2
 Release:	2
 License:	Apache
-Group:		Development/Languages/Java
+Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/collections/source/commons-collections-%{version}-src.tar.gz
 # Source0-md5:	dbf80727b384bfb9c220d78af30ebc14
-Source1:	%{name}-tomcat5-build.xml
-Patch0:		%{name}-target.patch
+Source1:	jakarta-commons-collections-tomcat5-build.xml
+Patch0:		jakarta-commons-collections-target.patch
 URL:		http://commons.apache.org/collections/
 BuildRequires:	ant
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	sed >= 4.0
+Obsoletes:	jakarta-commons-collections
+Provides:	jakarta-commons-collections
 Requires:	jre
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,7 +68,7 @@
 find -name '*.jar' | xargs rm -vf
 
 %build
-%ant jar javadoc
+%ant jar %{?with_javadoc:javadoc}
 
 # commons-collections-tomcat5
 %ant -f tomcat5-build.xml
@@ -80,9 +84,11 @@
 ln -sf commons-collections-tomcat5-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-collections-tomcat5.jar
 
 # javadoc
+%if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -a build/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -100,10 +106,12 @@
 %{_javadir}/commons-collections-tomcat5.jar
 %{_javadir}/commons-collections-tomcat5-%{version}.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
+%endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -111,6 +119,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2008/11/23 23:27:09  glen
+- renamed to java-commons-collections.spec
+
 Revision 1.25  2008/01/14 19:49:06  qboosh
 - pl for -tomcat5
 - no more Jakarta in descs
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-collections.spec?r1=1.25&r2=1.26&f=u