- remove prebuilt binaries

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

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index 37966b557616e477c54569dd56ac274cc663048e..66aed20d6549fc9ff09006cb1e6927bb7377c3af 100644 (file)
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -1,28 +1,31 @@
-# TODO
-# - rename to apache-commons-daemon?
+# 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
-Version:       1.0.1
-Release:       4
+
+%define                srcname commons-daemon
+Summary:       Commons Daemon - controlling of Java daemons
+Summary(pl.UTF-8):     Commons Daemon - kontrolowanie demonów w Javie
+Name:          java-commons-daemon
+Version:       1.0.2
+Release:       1
 License:       Apache v2.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
+Group:         Libraries/Java
+Source0:       http://www.apache.net.pl/commons/daemon/source/commons-daemon-%{version}-src.tar.gz
+# Source0-md5: a6c68eed204bc9f1ef3b77488edfcfeb
+Patch0:                jakarta-commons-daemon-link.patch
 URL:           http://commons.apache.org/daemon/
 BuildRequires: ant >= 1.4.1
 BuildRequires: automake
-BuildRequires: jdk >= 1.2
+BuildRequires: java-junit >= 3.7
+BuildRequires: jdk
 BuildRequires: jpackage-utils
-BuildRequires: junit >= 3.7
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
 BuildRequires: xmlto >= 0:0.0.18-1
-Requires:      jakarta-commons-collections >= 2.0
-Requires:      jakarta-commons-logging >= 1.0
-Requires:      jre >= 1.2
+Requires:      java-commons-collections >= 2.0
+Requires:      java-commons-logging >= 1.0
+Requires:      jpackage-utils
+Obsoletes:     jakarta-commons-daemon
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -36,28 +39,47 @@ 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 -n jsvc
+Summary:       Commons Daemon jsvc utility
+Summary(pl.UTF-8):     Narzędzie jsvc Commons Daemon
+Group:         Applications
+Requires:      %{name} = %{version}-%{release}
+
+%description -n jsvc
+Jsvc is a set of libraries and applications for making Java
+applications run on UNIX more easily.
+
+%description -n jsvc -l pl.UTF-8
+Jsvc jest zestawem bibliotek i aplikacji które ułatwiają uruchamianie
+aplikacji Javy.
+
 %package javadoc
-Summary:       Jakarta Commons Daemon documentation
-Summary(pl.UTF-8):     Dokumentacja do Jakarta Commons Daemon
+Summary:       Commons Daemon documentation
+Summary(pl.UTF-8):     Dokumentacja do Commons Daemon
 Group:         Documentation
 Requires:      jpackage-utils
 Obsoletes:     jakarta-commons-daemon-doc
+Obsoletes:     jakarta-commons-daemon-javadoc
 
 %description javadoc
-Jakarta Commons Daemon documentation.
+Commons Daemon documentation.
 
 %description javadoc -l pl.UTF-8
-Dokumentacja do Jakarta Commons Daemon.
+Dokumentacja do Commons Daemon.
 
 %prep
-%setup -q -n daemon-%{version}
+%setup -q -n %{srcname}-%{version}-src
+
+find -name '*.o' -o -name '*.a' | xargs rm
+
 %patch0 -p1
 
 %build
 # Java part
 required_jars="junit"
-export CLASSPATH=$(build-classpath $required_jars)
-%ant dist
+CLASSPATH=$(build-classpath $required_jars)
+export CLASSPATH
+%ant jar %{?with_javadoc:javadoc}
 
 # native part
 cd src/native/unix
@@ -72,13 +94,15 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 
 # 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
+cp -a dist/%{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.jar
+ln -s %{srcname}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}.jar
 
 # 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
+%if %{with javadoc}
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+cp -a dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
+%endif
 
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 install src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}
@@ -88,16 +112,21 @@ cp -a src/native/unix/man/jsvc.1 $RPM_BUILD_ROOT%{_mandir}/man1
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
-%doc dist/LICENSE
+%doc PROPOSAL.html RELEASE-NOTES.txt README
+%{_javadir}/*.jar
+
+%files -n jsvc
+%defattr(644,root,root,755)
 %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}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
+%endif