SPECS: dict-mueller7.spec - rel 7 (use %service)

[glen]

Author: glen                         Date: Mon Mar 12 00:17:09 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 7 (use %service)

---- Files affected:
SPECS:
   dict-mueller7.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SPECS/dict-mueller7.spec
diff -u SPECS/dict-mueller7.spec:1.14 SPECS/dict-mueller7.spec:1.15
--- SPECS/dict-mueller7.spec:1.14	Mon Feb 12 22:23:53 2007
+++ SPECS/dict-mueller7.spec	Mon Mar 12 01:17:04 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Słownik angielsko-rosyjski dla dictd
 Name:		dict-%{dictname}
 Version:	1.2
-Release:	6
+Release:	7
 License:	GPL
 Group:		Applications/Dictionaries
 Source0:	http://mueller-dic.chat.ru/Mueller7GPL.tgz
@@ -14,6 +14,7 @@
 Source1:	http://www.math.sunysb.edu/~comech/tools/to-dict
 # Source1-md5:	3c1b69c290fb4c06bf3456baf5bf8b97
 URL:		http://mueller-dic.chat.ru/
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	dictfmt
 BuildRequires:	dictzip
 %if "%(locale -a | grep '^ru_RU.koi8r$')" == ""
@@ -34,12 +35,11 @@
 
 %prep
 %setup -q -c
-
 cp %{SOURCE1} .
 sed -i -e 's/dictfmt -p/dictfmt --locale ru_RU.koi8r -p/' to-dict
+chmod +x ./to-dict
 
 %build
-chmod +x ./to-dict
 ./to-dict --no-trans usr/local/share/dict/Mueller7GPL.koi mueller7.notr
 ./to-dict --src-data mueller7.notr mueller7.data && rm -f mueller7.notr
 ./to-dict --data-dict mueller7.data mueller7 && rm -f mueller7.data
@@ -62,13 +62,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2 || true
+if [ "$1" = 0 ]; then
+	%service -q dictd restart
 fi
 
 %files
@@ -84,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2007/03/12 00:17:04  glen
+- rel 7 (use %service)
+
 Revision 1.14  2007/02/12 21:23:53  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dict-mueller7.spec?r1=1.14&r2=1.15&f=u