SPECS: java-commons-daemon.spec, jakarta-commons-daemon.spec (REMOVED) - re...

[glen]

Author: glen                         Date: Sun Nov 23 23:29:31 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename to java-commons-daemon.spec

---- Files affected:
SPECS:
   java-commons-daemon.spec (1.21 -> 1.22) , jakarta-commons-daemon.spec (1.21 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: SPECS/java-commons-daemon.spec
diff -u SPECS/java-commons-daemon.spec:1.21 SPECS/java-commons-daemon.spec:1.22
--- SPECS/java-commons-daemon.spec:1.21	Sat Feb  9 22:00:47 2008
+++ SPECS/java-commons-daemon.spec	Mon Nov 24 00:29:25 2008
@@ -1,17 +1,18 @@
 # $Revision$, $Date$
-# 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
+Name:		java-commons-daemon
 Version:	1.0.1
 Release:	4
 License:	Apache v2.0
-Group:		Development/Languages/Java
+Group:		Libraries/Java
 Source0:	http://www.apache.org/dist/jakarta/commons/daemon/source/daemon-%{version}.tar.gz
 # Source0-md5:	df3eb5aafa53ca530843a09d40b8a1c0
-Patch0:		%{name}-link.patch
+Patch0:		jakarta-commons-daemon-link.patch
 URL:		http://commons.apache.org/daemon/
 BuildRequires:	ant >= 1.4.1
 BuildRequires:	automake
@@ -23,7 +24,10 @@
 BuildRequires:	xmlto >= 0:0.0.18-1
 Requires:	jakarta-commons-collections >= 2.0
 Requires:	jakarta-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)
 
 %description
@@ -51,7 +55,8 @@
 Dokumentacja do Jakarta Commons Daemon.
 
 %prep
-%setup -q -n daemon-%{version}
+%setup -qc
+mv daemon-%{version}/* .
 %patch0 -p1
 
 %build
@@ -77,9 +82,11 @@
 ln -s commons-daemon-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-daemon.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
+%endif
 
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 install src/native/unix/jsvc $RPM_BUILD_ROOT%{_bindir}
@@ -98,10 +105,12 @@
 %{_mandir}/man1/jsvc.1*
 %{_javadir}/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
+%endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -109,6 +118,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2008/11/23 23:29:25  glen
+- rename to java-commons-daemon.spec
+
 Revision 1.21  2008/02/09 21:00:47  qboosh
 - unified License format
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-daemon.spec?r1=1.21&r2=1.22&f=u