- s/jakarta/java/ in Requires:

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

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index 80e77d88e5530a9558144e08fcb9493a47145478..9350c1bfcbb06cbaa40caf117667bc67f4721e71 100644 (file)
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -1,14 +1,17 @@
+# Conditional build:
+%bcond_without javadoc         # don't build javadoc
+
 %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
+Name:          java-commons-daemon
 Version:       1.0.1
-Release:       2
-License:       Apache License 2.0
-Group:         Development/Languages/Java
+Release:       4
+License:       Apache v2.0
+Group:         Libraries/Java
 Source0:       http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-%{version}.tar.gz
 # Source0-md5: df3eb5aafa53ca530843a09d40b8a1c0
-Patch0:                %{name}-link.patch
+Patch0:                jakarta-commons-daemon-link.patch
 URL:           http://commons.apache.org/daemon/
 BuildRequires: ant >= 1.4.1
 BuildRequires: automake
@@ -17,9 +20,13 @@ 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
+BuildRequires: xmlto >= 0:0.0.18-1
+Requires:      java-commons-collections >= 2.0
+Requires:      java-commons-logging >= 1.0
+Requires:      jpackage-utils
 Requires:      jre >= 1.2
+Provides:      jakarta-commons-daemon
+Obsoletes:     jakarta-commons-daemon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -38,7 +45,9 @@ Summary:      Jakarta Commons Daemon documentation
 Summary(pl.UTF-8):     Dokumentacja do Jakarta Commons Daemon
 Group:         Documentation
 Requires:      jpackage-utils
+Provides:      jakarta-commons-daemon-javadoc
 Obsoletes:     jakarta-commons-daemon-doc
+Obsoletes:     jakarta-commons-daemon-javadoc
 
 %description javadoc
 Jakarta Commons Daemon documentation.
@@ -47,7 +56,8 @@ Jakarta Commons Daemon documentation.
 Dokumentacja do Jakarta Commons Daemon.
 
 %prep
-%setup -q -n daemon-%{version}
+%setup -qc
+mv daemon-%{version}/* .
 %patch0 -p1
 
 %build
@@ -62,23 +72,26 @@ cp -f /usr/share/automake/config.sub support
 %configure \
        --with-java=%{java_home}
 %{__make}
+refentry2man < man/jsvc.1.xml > man/jsvc.1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 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
+
+# jars
+cp -a dist/commons-daemon.jar $RPM_BUILD_ROOT%{_javadir}/commons-daemon-%{version}.jar
+ln -s commons-daemon-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-daemon.jar
 
 # javadoc
+%if %{with 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
+%endif
 
-install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 install src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}
+cp -a src/native/unix/man/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,9 +103,12 @@ ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
 %defattr(644,root,root,755)
 %doc dist/LICENSE
 %attr(755,root,root) %{_bindir}/jsvc
+%{_mandir}/man1/jsvc.1*
 %{_javadir}/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
+%endif