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

[glen]

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

---- Files affected:
SPECS:
   jakarta-commons-daemon.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-daemon.spec
diff -u SPECS/jakarta-commons-daemon.spec:1.12 SPECS/jakarta-commons-daemon.spec:1.13
--- SPECS/jakarta-commons-daemon.spec:1.12	Tue Feb 13 09:06:35 2007
+++ SPECS/jakarta-commons-daemon.spec	Mon Apr  9 23:05:57 2007
@@ -9,36 +9,38 @@
 Source0:	http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-%{version}.tar.gz
 # Source0-md5:	df3eb5aafa53ca530843a09d40b8a1c0
 URL:		http://jakarta.apache.org/commons/daemon/
-BuildRequires:	automake
 BuildRequires:	ant >= 1.4.1
+BuildRequires:	automake
 BuildRequires:	jdk >= 1.2
+BuildRequires:	jpackage-utils
 BuildRequires:	junit >= 3.7
-Requires:	jre >= 1.2
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	jakarta-commons-collections >= 2.0
 Requires:	jakarta-commons-logging >= 1.0
+Requires:	jre >= 1.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-The Daemon Component contains a set of Java and native code,
-including a set of Java interfaces applications must implement and
-Unix native code to control a Java daemon from a Unix operating
-system.
+The Daemon Component contains a set of Java and native code, including
+a set of Java interfaces applications must implement and Unix native
+code to control a Java daemon from a Unix operating system.
 
 %description -l pl.UTF-8
-Komponent Daemon zawiera zbiór kodu w Javie i natywnego,
-zawierającego zbiór interfejsów w Javie, które muszą być
-zaimplementowane w aplikacjach oraz natywny kod uniksowy kontrolujący
-demony w Javie w systemie Unix.
+Komponent Daemon zawiera zbiór kodu w Javie i natywnego, zawierającego
+zbiór interfejsów w Javie, które muszą być zaimplementowane w
+aplikacjach oraz natywny kod uniksowy kontrolujący demony w Javie w
+systemie Unix.
 
-%package doc
+%package javadoc
 Summary:	Jakarta Commons Daemon documentation
 Summary(pl.UTF-8):	Dokumentacja do Jakarta Commons Daemon
 Group:		Development/Languages/Java
+Obsoletes:	jakarta-commons-daemon-doc
 
-%description doc
+%description javadoc
 Jakarta Commons Daemon documentation.
 
-%description doc -l pl.UTF-8
+%description javadoc -l pl.UTF-8
 Dokumentacja do Jakarta Commons Daemon.
 
 %prep
@@ -46,11 +48,9 @@
 
 %build
 # Java part
-cat > build.properties << EOF
-junit.home = %{_javadir}
-junit.jar = \${junit.home}
-EOF
-ant dist
+required_jars="junit"
+export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+%ant dist
 
 # native part
 cd src/native/unix
@@ -61,24 +61,41 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_bindir}}
-
-install dist/*.jar $RPM_BUILD_ROOT%{_javadir}
+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}
 
+install -d $RPM_BUILD_ROOT%{_bindir}
 install src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}
 
 %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
 %attr(755,root,root) %{_bindir}/jsvc
 %{_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 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2007/04/09 21:05:57  glen
+- unify java package
+
 Revision 1.12  2007/02/13 08:06:35  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-commons-daemon.spec?r1=1.12&r2=1.13&f=u