SPECS: dict-mueller7acc.spec, dict-sap.spec - rel 5 (use %service)

[glen]

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

---- Files affected:
SPECS:
   dict-mueller7acc.spec (1.10 -> 1.11) , dict-sap.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: SPECS/dict-mueller7acc.spec
diff -u SPECS/dict-mueller7acc.spec:1.10 SPECS/dict-mueller7acc.spec:1.11
--- SPECS/dict-mueller7acc.spec:1.10	Mon Feb 12 22:23:53 2007
+++ SPECS/dict-mueller7acc.spec	Mon Mar 12 01:16:58 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	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,6 +16,7 @@
 URL:		http://mueller-dic.chat.ru/
 BuildRequires:	dictfmt
 BuildRequires:	dictzip
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
 Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -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,13 +57,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
@@ -78,6 +77,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2007/03/12 00:16:58  glen
+- rel 5 (use %service)
+
 Revision 1.10  2007/02/12 21:23:53  glen
 - tabs in preamble
 

================================================================
Index: SPECS/dict-sap.spec
diff -u SPECS/dict-sap.spec:1.25 SPECS/dict-sap.spec:1.26
--- SPECS/dict-sap.spec:1.25	Mon Feb 12 22:23:53 2007
+++ SPECS/dict-sap.spec	Mon Mar 12 01:16:58 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	sap - słownik angielsko-polski i odwrotnie dla dictd
 Name:		dict-sap
 Version:	0.1b_0.1
-Release:	4
+Release:	5
 License:	GPL
 Group:		Applications/Dictionaries
 Source0:	%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	dictzip
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
 Requires:	dict
 Requires:	dictd
@@ -56,13 +57,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
@@ -77,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2007/03/12 00:16:58  glen
+- rel 5 (use %service)
+
 Revision 1.25  2007/02/12 21:23:53  glen
 - tabs in preamble
 
@@ -90,8 +92,8 @@
 - unify
 
 Revision 1.21  2005/01/18 10:44:33  luzik
- - dict-sap binary Required dict
- - rel 4 STBR
+- dict-sap binary Required dict
+- rel 4 STBR
 
 Revision 1.20  2004/08/19 15:51:15  averne
 - rel++
@@ -130,12 +132,12 @@
 - added URL to dict project.
 
 Revision 1.9  2002/05/21 23:12:55  kloczek
-perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
+- perl -pi -e "s/^automake -a -c -f --foreing/\%\{__automake\}/; \
              s/^automake -a -c -f/\%\{__automake\}/; \
-	     s/^autoconf/\%\{__autoconf\}/"
+     s/^autoconf/\%\{__autoconf\}/"
 
 Revision 1.8  2002/04/25 16:11:49  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.7  2002/02/23 01:47:49  kloczek
 - adapterized.
@@ -145,7 +147,7 @@
   Group field using gettext).
 
 Revision 1.5  2002/01/18 02:12:42  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.4  2001/11/21 14:02:17  qboosh
 - adapterized, pl translations
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dict-mueller7acc.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/dict-sap.spec?r1=1.25&r2=1.26&f=u