- enhanced descriptions and dependencies

- build native part (jsvc), no longer noarch
- added nobat patch, removed hack

Changed files:
    jakarta-commons-daemon-nobat.patch -> 1.1
    java-commons-daemon.spec -> 1.2

diff --git a/jakarta-commons-daemon-nobat.patch b/jakarta-commons-daemon-nobat.patch
new file mode 100644 (file)
index 0000000..6dce436
--- /dev/null
+++ b/jakarta-commons-daemon-nobat.patch
@@ -0,0 +1,15 @@
+--- commons-daemon-src/build.xml.orig  Thu Jul 11 23:37:40 2002
++++ commons-daemon-src/build.xml       Wed Mar 26 03:14:22 2003
+@@ -227,11 +227,7 @@
+     <copy     todir="${dist.home}/lib" filtering="off">
+       <fileset dir="${ant.home}/lib" includes="*.jar"/>
+     </copy>
+-    <fixcrlf srcdir="${ant.home}/bin"
+-           includes="antRun.bat"
+-            destdir="${dist.home}/bin"
+-                eol="crlf"/>
+-    <fixcrlf srcdir="${ant.home}/bin"
++    <fixcrlf srcdir="/usr/bin"
+            includes="antRun"
+             destdir="${dist.home}/bin"
+                 eol="lf"/>

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index 4854dedba3af356d7ad18f6b05a50eab53435375..4fc0bf50d6b5b59a22cec2ac50f006c5678a42a2 100644 (file)
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -1,54 +1,82 @@
-Summary:       Jakarta Commons Daemon
+Summary:       Jakarta Commons Daemon - controlling of Java daemons
+Summary(pl):   Jakarta Commons Daemon - kontrolowanie demonów w Javie
 Name:          jakarta-commons-daemon
 Version:       0.1
 Release:       1
 License:       Apache
 Group:         Development/Languages/Java
 Source0:       http://jakarta.apache.org/~jfclere/commons-daemon/commons-daemon-src.tar.gz
+Patch0:                %{name}-nobat.patch
 URL:           http://jakarta.apache.org/
-Requires:      jre
-BuildRequires: jakarta-ant
-BuildRequires: junit
-BuildArch:     noarch
+BuildRequires: automake
+BuildRequires: jakarta-ant >= 1.4.1
+BuildRequires: jdk >= 1.2
+BuildRequires: junit >= 3.7
+Requires:      jre >= 1.2
+Requires:      jakarta-commons-collections >= 2.0
+Requires:      jakarta-commons-logging >= 1.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _javalibdir     /usr/share/java
 
 %description
-Jakarta Commons Daemon.
+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.
 
 %package doc
-Summary:       Jakarta Commons Daemon
+Summary:       Jakarta Commons Daemon documentation
+Summary(pl):   Dokumentacja do Jakarta Commons Daemon
 Group:         Development/Languages/Java
 
 %description doc
-Jakarta Commons Daemon.
+Jakarta Commons Daemon documentation.
+
+%description doc -l pl
+Dokumentacja do Jakarta Commons Daemon.
 
 %prep
 %setup -q -n commons-daemon-src
+%patch -p1
 
 %build
+# Java part
 touch LICENSE
 mkdir srcdir
 cat > build.properties << EOF
 junit.home = %{_javalibdir}
 junit.jar = \${junit.home}
 EOF
-#hack
-ant dist || true
+ant dist
+
+# native part
+cd src/native/unix
+%configure \
+       --with-java=/usr/lib/java
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_javalibdir},%{_bindir}}
 
-install -d $RPM_BUILD_ROOT%{_javalibdir}
 install dist/*.jar $RPM_BUILD_ROOT%{_javalibdir}
 
+install dist/jsvc $RPM_BUILD_ROOT%{_bindir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %doc dist/LICENSE
+%attr(755,root,root) %{_bindir}/jsvc
 %{_javalibdir}/*.jar
 
 %files doc