SPECS: java-commons-pool.spec, jakarta-commons-pool.spec (REMOVED) - rename...

glen glen at pld-linux.org
Mon Nov 24 00:49:46 CET 2008


Author: glen                         Date: Sun Nov 23 23:49:46 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename to java-commons-pool.spec

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

---- Diffs:

================================================================
Index: SPECS/java-commons-pool.spec
diff -u SPECS/java-commons-pool.spec:1.26 SPECS/java-commons-pool.spec:1.27
--- SPECS/java-commons-pool.spec:1.26	Mon Jan 14 21:09:43 2008
+++ SPECS/java-commons-pool.spec	Mon Nov 24 00:49:41 2008
@@ -1,17 +1,19 @@
 # $Revision$, $Date$
-# TODO
-# - rename to apache-commons-pool?
+#
+# Conditional build:
+%bcond_without	javadoc		# don't build javadoc
+
 %include	/usr/lib/rpm/macros.java
 Summary:	Commons Pool - object pooling interfaces
 Summary(pl.UTF-8):	Commons Pool - interfejsy gospodarujące obiektami
-Name:		jakarta-commons-pool
+Name:		java-commons-pool
 Version:	1.3
 Release:	3
 License:	Apache
-Group:		Development/Languages/Java
+Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/commons/pool/source/commons-pool-%{version}-src.tar.gz
 # Source0-md5:	a2dcdff75de2af76f5f2169494ed3499
-Source1:	%{name}-tomcat5-build.xml
+Source1:	jakarta-commons-pool-tomcat5-build.xml
 URL:		http://commons.apache.org/pool/
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-collections >= 1.0
@@ -20,7 +22,10 @@
 BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jakarta-commons-collections >= 1.0
+Requires:	jpackage-utils
 Requires:	jre >= 1.2
+Provides:	jakarta-commons-pool
+Obsoletes:	jakarta-commons-pool
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -69,22 +74,24 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-install dist/commons-pool-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-pool-%{version}.jar
+cp -a dist/commons-pool-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-pool-%{version}.jar
 ln -s commons-pool-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-pool.jar
 
-install pool-tomcat5/commons-pool-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/commons-pool-tomcat5-%{version}.jar
+cp -a pool-tomcat5/commons-pool-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/commons-pool-tomcat5-%{version}.jar
 ln -sf commons-pool-tomcat5-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-pool-tomcat5.jar
 
 # javadoc
+%if %{with javadoc}
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-ln -sf %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -97,10 +104,12 @@
 %{_javadir}/commons-pool-tomcat5.jar
 %{_javadir}/commons-pool-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
@@ -108,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.27  2008/11/23 23:49:41  glen
+- rename to java-commons-pool.spec
+
 Revision 1.26  2008/01/14 20:09:43  qboosh
 - pl for -tomcat5
 - no more Jakarta in descs
================================================================

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



More information about the pld-cvs-commit mailing list