- realy split

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

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index 1b9baa9bf534e16ad996e80e65d6f2bee1411652..7e33d23beb3f44020f37679f0721a4dce2d47485 100644 (file)
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -6,26 +6,25 @@
 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
+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:      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)
 
@@ -40,12 +39,25 @@ 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:       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
 
@@ -56,8 +68,8 @@ Commons Daemon documentation.
 Dokumentacja do Commons Daemon.
 
 %prep
-%setup -qc
-mv daemon-%{version}/* .
+%setup -q -n %{srcname}-%{version}-src
+
 %patch0 -p1
 
 %build
@@ -80,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 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
@@ -102,10 +114,13 @@ ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %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