- unify java package

- version in license
- fix java home dir in native part building

Changed files:
    java-commons-daemon.spec -> 1.17

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index c0ca1ae6023b954ecb88b9b02544d63459645564..80e77d88e5530a9558144e08fcb9493a47145478 100644 (file)
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -1,19 +1,21 @@
+%include       /usr/lib/rpm/macros.java
 Summary:       Jakarta Commons Daemon - controlling of Java daemons
 Summary(pl.UTF-8):     Jakarta Commons Daemon - kontrolowanie demonów w Javie
 Name:          jakarta-commons-daemon
 Version:       1.0.1
-Release:       1
-License:       Apache
+Release:       2
+License:       Apache License 2.0
 Group:         Development/Languages/Java
 Source0:       http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-%{version}.tar.gz
 # Source0-md5: df3eb5aafa53ca530843a09d40b8a1c0
 Patch0:                %{name}-link.patch
-URL:           http://jakarta.apache.org/commons/daemon/
+URL:           http://commons.apache.org/daemon/
 BuildRequires: ant >= 1.4.1
 BuildRequires: automake
 BuildRequires: jdk >= 1.2
 BuildRequires: jpackage-utils
 BuildRequires: junit >= 3.7
+BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
 Requires:      jakarta-commons-collections >= 2.0
 Requires:      jakarta-commons-logging >= 1.0
@@ -35,6 +37,7 @@ systemie Unix.
 Summary:       Jakarta Commons Daemon documentation
 Summary(pl.UTF-8):     Dokumentacja do Jakarta Commons Daemon
 Group:         Documentation
+Requires:      jpackage-utils
 Obsoletes:     jakarta-commons-daemon-doc
 
 %description javadoc
@@ -50,14 +53,14 @@ Dokumentacja do Jakarta Commons Daemon.
 %build
 # Java part
 required_jars="junit"
-export CLASSPATH=$(/usr/bin/build-classpath $required_jars)
+export CLASSPATH=$(build-classpath $required_jars)
 %ant dist
 
 # native part
 cd src/native/unix
 cp -f /usr/share/automake/config.sub support
 %configure \
-       --with-java=%{_libdir}/java
+       --with-java=%{java_home}
 %{__make}
 
 %install
@@ -71,7 +74,8 @@ done
 
 # javadoc
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 install -d $RPM_BUILD_ROOT%{_bindir}
 install src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}
@@ -80,13 +84,7 @@ install src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}
 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
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 
 %files
 %defattr(644,root,root,755)
@@ -97,3 +95,4 @@ fi
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}