SPECS: prelude-manager.spec - correct %service usage

[glen]

Author: glen                         Date: Wed Apr 12 18:44:24 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- correct %service usage

---- Files affected:
SPECS:
   prelude-manager.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/prelude-manager.spec
diff -u SPECS/prelude-manager.spec:1.6 SPECS/prelude-manager.spec:1.7
--- SPECS/prelude-manager.spec:1.6	Wed Apr 12 17:57:46 2006
+++ SPECS/prelude-manager.spec	Wed Apr 12 20:44:18 2006
@@ -14,12 +14,14 @@
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 URL:		http://www.prelude-ids.org/
-Requires:	libprelude >= 0.9.7.2
-Requires:	libpreludedb >= 0.9.7.1
 BuildRequires:	gnutls-devel
 BuildRequires:	libprelude-devel >= 0.9.7.2
 BuildRequires:	libpreludedb-devel >= 0.9.7.1
 BuildRequires:	libxml2-devel
+BuildRequires:	rpmbuild(macros) >= 1.268
+Requires(post,preun):	rc-scripts
+Requires:	libprelude >= 0.9.7.2
+Requires:	libpreludedb >= 0.9.7.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,7 +45,7 @@
 Pliki nagłówkowe dla prelude-managera.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
 %configure
@@ -60,7 +62,7 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
-install -d $RPM_BUILD_ROOT/etc/prelude/profile/%{name}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/prelude/profile/%{name}
 install -d $RPM_BUILD_ROOT/var/spool/prelude/%{name}
 
 %clean
@@ -68,13 +70,11 @@
 
 %post
 /sbin/chkconfig --add prelude-manager
-if [ -f /var/lock/subsys/prelude-manager ]; then
-        %service prelude-manager restart 1>&2
-else
+if [ "$1" = 1 ]; then
 	echo "Run \"prelude-adduser add prelude-manager --uid 0 --gid 0\" before"
 	echo "starting Prelude Manager for the first time."
-        echo "Run \"/sbin/service prelude-manager start\" to start Prelude Manager."
 fi
+%service prelude-manager restart "Prelude Manager"
 
 # TODO:
 #
@@ -133,6 +133,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2006/04/12 18:44:18  glen
+- correct %service usage
+
 Revision 1.6  2006/04/12 15:57:46  mguevara
 - 0.9.4.1 rel 0.3 - added some init comments (todo), requires, dirs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/prelude-manager.spec?r1=1.6&r2=1.7&f=u