SPECS: jakarta-commons-dbcp.spec - unify java package, builds with...

[glen]

Author: glen                         Date: Mon Apr  9 21:16:54 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unify java package, builds with java 1.5

---- Files affected:
SPECS:
   jakarta-commons-dbcp.spec (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-dbcp.spec
diff -u SPECS/jakarta-commons-dbcp.spec:1.15 SPECS/jakarta-commons-dbcp.spec:1.16
--- SPECS/jakarta-commons-dbcp.spec:1.15	Tue Feb 13 09:06:35 2007
+++ SPECS/jakarta-commons-dbcp.spec	Mon Apr  9 23:16:49 2007
@@ -10,16 +10,17 @@
 # Source0-md5:	b7336a1d34ea0e8e9c39b67af510c46d
 URL:		http://jakarta.apache.org/commons/dbcp/
 BuildRequires:	ant
+BuildRequires:	jakarta-commons-collections
 BuildRequires:	jakarta-commons-pool >= 1.2
 BuildRequires:	jdk >= 1.2
+BuildRequires:	jpackage-utils
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jakarta-commons-collections
 Requires:	jakarta-commons-pool >= 1.2
 Requires:	jre >= 1.2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javalibdir	%{_datadir}/java
-
 %description
 The DBCP package provides database connection pooling services. The
 following features are supported:
@@ -42,43 +43,60 @@
  - obsługa zarządzania PreparedStatement,
  - konfiguracja w XML-u.
 
-%package doc
+%package javadoc
 Summary:	Jakarta Commons DBCP
 Summary(pl.UTF-8):	Dokumentacja do Jakarta Commons DBCP
-Group:		Development/Languages/Java
+Group:		Documentation
+Requires:	jpackage-utils
+Obsoletes:	jakarta-commons-dbcp-doc
 
-%description doc
+%description javadoc
 Jakarta Commons DBCP.
 
-%description doc -l pl.UTF-8
+%description javadoc -l pl.UTF-8
 Dokumentacja do Jakarta Commons DBCP.
 
 %prep
 %setup -q -n commons-dbcp-%{version}
 
 %build
-cat << EOF > build.properties
-commons-pool.jar=%{_javalibdir}/commons-pool.jar
-EOF
-ant dist
+required_jars="commons-pool commons-collections"
+export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+%ant dist
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javalibdir}
-
-install dist/*.jar $RPM_BUILD_ROOT%{_javalibdir}
+install -d $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 *.txt
-%{_javalibdir}/*.jar
+%{_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
@@ -86,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16  2007/04/09 21:16:49  glen
+- unify java package, builds with java 1.5
+
 Revision 1.15  2007/02/13 08:06:35  glen
 - tabs in preamble
 
================================================================

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