SPECS: jakarta-commons-pool.spec - build -tomcat5 dependency inste...

[glen]

Author: glen                         Date: Sun Dec  2 21:33:57 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build -tomcat5 dependency instead of -source for tomcat; rel 2

---- Files affected:
SPECS:
   jakarta-commons-pool.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-pool.spec
diff -u SPECS/jakarta-commons-pool.spec:1.22 SPECS/jakarta-commons-pool.spec:1.23
--- SPECS/jakarta-commons-pool.spec:1.22	Sat Apr 14 09:37:23 2007
+++ SPECS/jakarta-commons-pool.spec	Sun Dec  2 22:33:52 2007
@@ -4,17 +4,18 @@
 Summary(pl.UTF-8):	Jakarta Commons Pool - interfejsy gospodarujące obiektami
 Name:		jakarta-commons-pool
 Version:	1.3
-Release:	1.2
+Release:	2
 License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/jakarta/commons/pool/source/commons-pool-%{version}-src.tar.gz
 # Source0-md5:	a2dcdff75de2af76f5f2169494ed3499
+Source1:	%{name}-tomcat5-build.xml
 URL:		http://jakarta.apache.org/commons/pool/
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-collections >= 1.0
-BuildRequires:	rpm-javaprov
 BuildRequires:	jdk >= 1.2
 BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
 BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jakarta-commons-collections >= 1.0
 Requires:	jre >= 1.2
@@ -41,26 +42,23 @@
 %description javadoc -l pl.UTF-8
 Dokumentacja do Jakarta Commons Pool.
 
-%package source
-Summary:	Jakarta Commons Pool source code
-Summary(pl.UTF-8):	Kod źródłowy Jakarta Commons Pool
+%package tomcat5
+Summary:	Pool dependency for Tomcat5
 Group:		Development/Languages/Java
-AutoReq:	no
-AutoProv:	no
-
-%description source
-Jakarta Commons Pool source code.
+Obsoletes:	jakarta-commons-pool-source
 
-%description source -l pl.UTF-8
-Kod źródłowy Jakarta Commons Pool.
+%description tomcat5
+Pool dependency for Tomcat5
 
 %prep
 %setup -q -n commons-pool-%{version}-src
+cp %{SOURCE1} tomcat5-build.xml
 
 %build
 required_jars="commons-collections"
-export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+export CLASSPATH=$(build-classpath $required_jars)
 %ant dist
+%ant -f tomcat5-build.xml
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -68,15 +66,14 @@
 install 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}/%{name}-tomcat5-%{version}.jar
+ln -sf %{name}-tomcat5-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5.jar
+
 # 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
 
-# source code
-install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
-cp -a src $RPM_BUILD_ROOT%{_prefix}/src/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -86,23 +83,28 @@
 %files
 %defattr(644,root,root,755)
 %doc dist/LICENSE.txt
-%{_javadir}/*.jar
+%{_javadir}/commons-pool.jar
+%{_javadir}/commons-pool-%{version}.jar
+
+%files tomcat5
+%defattr(644,root,root,755)
+%{_javadir}/%{name}-tomcat5.jar
+%{_javadir}/%{name}-tomcat5-%{version}.jar
 
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
 
-%files source
-%defattr(644,root,root,755)
-%{_prefix}/src/%{name}-%{version}
-
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2007-12-02 21:33:52  glen
+- build -tomcat5 dependency instead of -source for tomcat; rel 2
+
 Revision 1.22  2007-04-14 07:37:23  qboosh
 - pl for -source
 
================================================================

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