SPECS (AC-branch): dict-mueller7acc.spec - HEAD merge

[glen]

Author: glen                         Date: Mon Mar 12 00:55:25 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge

---- Files affected:
SPECS:
   dict-mueller7acc.spec (1.7 -> 1.7.2.1) 

---- Diffs:

================================================================
Index: SPECS/dict-mueller7acc.spec
diff -u SPECS/dict-mueller7acc.spec:1.7 SPECS/dict-mueller7acc.spec:1.7.2.1
--- SPECS/dict-mueller7acc.spec:1.7	Thu Aug 19 17:51:15 2004
+++ SPECS/dict-mueller7acc.spec	Mon Mar 12 01:55:20 2007
@@ -4,7 +4,7 @@
 Summary(pl):	Słownik angielsko-rosyjski z akcentami dla dictd
 Name:		dict-%{dictname}
 Version:	1.2
-Release:	4
+Release:	5
 License:	GPL
 Group:		Applications/Dictionaries
 Source0:	http://mueller-dic.chat.ru/Mueller7accentGPL.tgz
@@ -16,8 +16,9 @@
 URL:		http://mueller-dic.chat.ru/
 BuildRequires:	dictfmt
 BuildRequires:	dictzip
-Requires:	dictd
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
+Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,10 +31,10 @@
 
 %prep
 %setup -q -c
-
-%build
 cp %{SOURCE1} .
 chmod +x ./to-dict
+
+%build
 ./to-dict --no-trans usr/local/share/dict/Mueller7accentGPL.koi mueller7acc.notr
 ./to-dict --src-data mueller7acc.notr mueller7acc.data && rm -f mueller7acc.notr
 ./to-dict --data-dict mueller7acc.data mueller7acc && rm -f mueller7acc.data
@@ -56,20 +57,18 @@
 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
 %defattr(644,root,root,755)
 %doc usr/local/share/mova/Mueller7.txt
 %lang(ru) %doc usr/local/share/mova/Mueller7_koi.txt
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/%{dictname}.dictconf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dictd/%{dictname}.dictconf
 %{_datadir}/dictd/%{dictname}.*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -78,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7.2.1  2007/03/12 00:55:20  glen
+- HEAD merge
+
 Revision 1.7  2004/08/19 15:51:15  averne
 - rel++
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dict-mueller7acc.spec?r1=1.7&r2=1.7.2.1&f=u