SPECS: jakarta-commons-pool.spec - unify java package

[glen]

Author: glen                         Date: Mon Apr  9 21:10:41 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package

---- Files affected:
SPECS:
   jakarta-commons-pool.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-pool.spec
diff -u SPECS/jakarta-commons-pool.spec:1.14 SPECS/jakarta-commons-pool.spec:1.15
--- SPECS/jakarta-commons-pool.spec:1.14	Tue Feb 13 09:06:35 2007
+++ SPECS/jakarta-commons-pool.spec	Mon Apr  9 23:10:36 2007
@@ -8,11 +8,13 @@
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/jakarta/commons/pool/source/commons-pool-%{version}-src.tar.gz
 # Source0-md5:	e7dc9f479c6a4260f84f6751b434295a
-Patch0:		jakarta-commons-pool-java15.patch   
+Patch0:		%{name}-java15.patch
 URL:		http://jakarta.apache.org/commons/pool/
 BuildRequires:	ant
-BuildRequires:	jdk >= 1.2
 BuildRequires:	jakarta-commons-collections >= 1.0
+BuildRequires:	jdk >= 1.2
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jakarta-commons-collections >= 1.0
 Requires:	jre >= 1.2
 BuildArch:	noarch
@@ -26,15 +28,16 @@
 Pakiet Pool definiuje uogólnione interfejsy gospodarowania obiektami
 oraz dostarcza kilku implementacji ogólnego przeznaczenia.
 
-%package doc
+%package javadoc
 Summary:	Jakarta Commons Pool documentation
 Summary(pl.UTF-8):	Dokumentacja do Jakarta Commons Pool
 Group:		Development/Languages/Java
+Obsoletes:	jakarta-commons-pool-doc
 
-%description doc
+%description javadoc
 Jakarta Commons Pool documentation.
 
-%description doc -l pl.UTF-8
+%description javadoc -l pl.UTF-8
 Dokumentacja do Jakarta Commons Pool.
 
 %prep
@@ -42,29 +45,44 @@
 %patch0
 
 %build
-JAVA_HOME=%{_libdir}/java
-export JAVA_HOME
-CLASSPATH=$CLASSPATH:%{_datadir}/java/commons-collections.jar
-export CLASSPATH
-ant dist
+required_jars="commons-collections"
+export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+%ant dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
-install dist/*.jar $RPM_BUILD_ROOT%{_javadir}
+for a in dist/*.jar; do
+	jar=${a##*/}
+	cp -a dist/$jar $RPM_BUILD_ROOT%{_javadir}/${jar%%.jar}-%{version}.jar
+	ln -s ${jar%%.jar}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/$jar
+done
+
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+	rm -f %{_javadocdir}/%{name}
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc dist/LICENSE.txt
 %{_javadir}/*.jar
 
-%files doc
+%files javadoc
 %defattr(644,root,root,755)
-%doc dist/docs
+%{_javadocdir}/%{name}-%{version}
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -72,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2007/04/09 21:10:36  glen
+- unify java package
+
 Revision 1.14  2007/02/13 08:06:35  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-commons-pool.spec?r1=1.14&r2=1.15&f=u