# Conditional build:
%bcond_without javadoc # don't build javadoc
-%if "%{pld_release}" == "ti"
-%bcond_without java_sun # build with gcj
-%else
-%bcond_with java_sun # build with java-sun
-%endif
-
%include /usr/lib/rpm/macros.java
%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.1
-Release: 5
+Version: 1.0.2
+Release: 1
License: Apache v2.0
Group: Libraries/Java
-Source0: http://www.apache.org/dist/commons/daemon/source/daemon-%{version}.tar.gz
-# Source0-md5: df3eb5aafa53ca530843a09d40b8a1c0
+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
-%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
-%{?with_java_sun:BuildRequires: java-sun}
+BuildRequires: java-junit >= 3.7
+BuildRequires: jdk
BuildRequires: jpackage-utils
-BuildRequires: junit >= 3.7
-BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
BuildRequires: xmlto >= 0:0.0.18-1
Requires: java-commons-collections >= 2.0
Requires: java-commons-logging >= 1.0
Requires: jpackage-utils
-Provides: jakarta-commons-daemon
Obsoletes: jakarta-commons-daemon
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
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: Commons Daemon documentation
Summary(pl.UTF-8): Dokumentacja do Commons Daemon
Group: Documentation
Requires: jpackage-utils
-Provides: jakarta-commons-daemon-javadoc
Obsoletes: jakarta-commons-daemon-doc
Obsoletes: jakarta-commons-daemon-javadoc
Dokumentacja do Commons Daemon.
%prep
-%setup -qc
-mv daemon-%{version}/* .
+%setup -q -n %{srcname}-%{version}-src
+
+find -name '*.o' -o -name '*.a' | xargs rm
+
%patch0 -p1
%build
install -d $RPM_BUILD_ROOT%{_javadir}
# jars
-cp -a dist/%{srcname}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-%{version}.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
%files
%defattr(644,root,root,755)
-%doc PROPOSAL.html RELEASE-NOTES.txt STATUS.html
+%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