- unify java package

[packages/java-commons-daemon.git] / java-commons-daemon.spec

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index 6a79ac6ad41fc6c8cf2a5057acd06f6e6077726b..80e77d88e5530a9558144e08fcb9493a47145478 100644 (file)
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -1,80 +1,98 @@
+%include       /usr/lib/rpm/macros.java
 Summary:       Jakarta Commons Daemon - controlling of Java daemons
-Summary(pl):   Jakarta Commons Daemon - kontrolowanie demonów w Javie
+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
-URL:           http://jakarta.apache.org/commons/daemon/
+Patch0:                %{name}-link.patch
+URL:           http://commons.apache.org/daemon/
+BuildRequires: ant >= 1.4.1
 BuildRequires: automake
-BuildRequires: jakarta-ant >= 1.4.1
 BuildRequires: jdk >= 1.2
+BuildRequires: jpackage-utils
 BuildRequires: junit >= 3.7
-Requires:      jre >= 1.2
+BuildRequires: rpm-javaprov
+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
-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.
+%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.
 
-%package doc
+%package javadoc
 Summary:       Jakarta Commons Daemon documentation
-Summary(pl):   Dokumentacja do Jakarta Commons Daemon
-Group:         Development/Languages/Java
+Summary(pl.UTF-8):     Dokumentacja do Jakarta Commons Daemon
+Group:         Documentation
+Requires:      jpackage-utils
+Obsoletes:     jakarta-commons-daemon-doc
 
-%description doc
+%description javadoc
 Jakarta Commons Daemon documentation.
 
-%description doc -l pl
+%description javadoc -l pl.UTF-8
 Dokumentacja do Jakarta Commons Daemon.
 
 %prep
 %setup -q -n daemon-%{version}
+%patch0 -p1
 
 %build
 # Java part
-cat > build.properties << EOF
-junit.home = %{_javadir}
-junit.jar = \${junit.home}
-EOF
-ant dist
+required_jars="junit"
+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
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_bindir}}
+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
 
-install dist/*.jar $RPM_BUILD_ROOT%{_javadir}
+# javadoc
+install -d $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}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+
 %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}
+%ghost %{_javadocdir}/%{name}