X-Git-Url: http://git.pld-linux.org/?p=packages%2Fjava-commons-daemon.git;a=blobdiff_plain;f=java-commons-daemon.spec;h=7e33d23beb3f44020f37679f0721a4dce2d47485;hp=02aabecfc1628944671dfb0f9852a70797c94557;hb=f9bf47ef41431955867c176ae1b1bd32a5cd730a;hpb=d5a3b0e18154bdaf0b34e22f67c58d330eb2812d

diff --git a/java-commons-daemon.spec b/java-commons-daemon.spec
index 02aabec..7e33d23 100644
--- a/java-commons-daemon.spec
+++ b/java-commons-daemon.spec
@@ -1,31 +1,30 @@
 # Conditional build:
 %bcond_without	javadoc		# don't build javadoc
-
 %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:	4
+Version:	1.0.2
+Release:	1
 License:	Apache v2.0
 Group:		Libraries/Java
-Source0:	http://www.apache.org/dist/jakarta/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:	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:	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)
 
@@ -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,15 +68,16 @@ Commons Daemon documentation.
 Dokumentacja do Commons Daemon.
 
 %prep
-%setup -qc
-mv daemon-%{version}/* .
+%setup -q -n %{srcname}-%{version}-src
+
 %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
@@ -79,14 +92,14 @@ 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
 %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
+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}
@@ -97,18 +110,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