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

[glen]

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

---- Files affected:
SPECS:
   dict-mueller7.spec (1.11 -> 1.11.2.1) 

---- Diffs:

================================================================
Index: SPECS/dict-mueller7.spec
diff -u SPECS/dict-mueller7.spec:1.11 SPECS/dict-mueller7.spec:1.11.2.1
--- SPECS/dict-mueller7.spec:1.11	Thu Aug 26 03:24:21 2004
+++ SPECS/dict-mueller7.spec	Mon Mar 12 01:54:07 2007
@@ -4,7 +4,7 @@
 Summary(pl):	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,14 +14,15 @@
 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$')" == ""
 BuildRequires:	glibc-localedb-all
 %endif
 BuildRequires:	sed >= 4.0
-Requires:	dictd
 Requires:	%{_sysconfdir}/dictd
+Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -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,20 +62,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"`)
@@ -84,6 +82,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11.2.1  2007/03/12 00:54:07  glen
+- HEAD merge
+
 Revision 1.11  2004/08/26 01:24:21  domelu
 - rel. 6 to rebuild
 
================================================================

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