SPECS: dict-anhviet.spec, dict-bouvier.spec, dict-gcide.spec, dict...

glen glen at pld-linux.org
Mon Mar 12 01:16:58 CET 2007 

Author: glen                         Date: Mon Mar 12 00:16:58 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 4 (use %service)

---- Files affected:
SPECS:
   dict-anhviet.spec (1.11 -> 1.12) , dict-bouvier.spec (1.14 -> 1.15) , dict-gcide.spec (1.10 -> 1.11) , dict-idp.spec (1.20 -> 1.21) , dict-vietanh.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SPECS/dict-anhviet.spec
diff -u SPECS/dict-anhviet.spec:1.11 SPECS/dict-anhviet.spec:1.12
--- SPECS/dict-anhviet.spec:1.11	Mon Feb 12 22:23:53 2007
+++ SPECS/dict-anhviet.spec	Mon Mar 12 01:16:52 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Słownik angielsko-wietnamski dla dictd
 Name:		dict-%{dictname}
 Version:	1.0
-Release:	3
+Release:	4
 License:	GPL (?)
 Group:		Applications/Dictionaries
 Source0:	http://vietlug.sourceforge.net/download/emacs/%{dictname}.index
@@ -12,6 +12,7 @@
 Source1:	http://vietlug.sourceforge.net/download/emacs/%{dictname}.utf.dz
 # Source1-md5:	e96b030c7814d8ee9dbd30cd039e5f70
 URL:		http://vietlug.sourceforge.net/
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
 Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -42,13 +43,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
@@ -62,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/03/12 00:16:52  glen
+- rel 4 (use %service)
+
 Revision 1.11  2007/02/12 21:23:53  glen
 - tabs in preamble
 

================================================================
Index: SPECS/dict-bouvier.spec
diff -u SPECS/dict-bouvier.spec:1.14 SPECS/dict-bouvier.spec:1.15
--- SPECS/dict-bouvier.spec:1.14	Mon Feb 12 22:23:53 2007
+++ SPECS/dict-bouvier.spec	Mon Mar 12 01:16:52 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Słownik prawa USA Johna Bouviera z 1856 roku w formacie DICTD
 Name:		dict-bouvier
 Version:	6
-Release:	3
+Release:	4
 License:	GPL
 # it was downloaded from http://www.constitution.org/bouv/bouvier.htm
 # Upstream Author(s): John Bouvier, 1856.
@@ -18,6 +18,7 @@
 BuildRequires:	dictzip
 BuildRequires:	python
 BuildRequires:	python-dictlib
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
 Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,7 +39,6 @@
 %patch0 -p1
 
 %build
-
 python conv.py *.txt
 
 %install
@@ -49,13 +49,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
@@ -69,6 +67,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2007/03/12 00:16:52  glen
+- rel 4 (use %service)
+
 Revision 1.14  2007/02/12 21:23:53  glen
 - tabs in preamble
 

================================================================
Index: SPECS/dict-gcide.spec
diff -u SPECS/dict-gcide.spec:1.10 SPECS/dict-gcide.spec:1.11
--- SPECS/dict-gcide.spec:1.10	Mon Feb 12 22:23:53 2007
+++ SPECS/dict-gcide.spec	Mon Mar 12 01:16:52 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Słownik Collaborative International Dictionary of English dla dictd
 Name:		dict-%{dictname}
 Version:	0.44
-Release:	3
+Release:	4
 License:	GPL
 Group:		Applications/Dictionaries
 Source0:	ftp://ftp.dict.org/pub/dict/pre/%{name}-%{version}.tar.gz
@@ -12,6 +12,7 @@
 # based on ftp://ftp.gnu.org/gnu/gcide/gcide-0.46/README.DIC
 Source1:	%{name}-README.DIC
 URL:		http://www.dict.org/
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
 Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -40,19 +41,17 @@
 	data  \"$dictprefix.dict.dz\"
 	index \"$dictprefix.index\"
 }" > $RPM_BUILD_ROOT%{_sysconfdir}/dictd/%{dictname}.dictconf
-mv %{dictname}.* $RPM_BUILD_ROOT%{_datadir}/dictd
+cp -a %{dictname}.* $RPM_BUILD_ROOT%{_datadir}/dictd
 
 %clean
 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
@@ -67,6 +66,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2007/03/12 00:16:52  glen
+- rel 4 (use %service)
+
 Revision 1.10  2007/02/12 21:23:53  glen
 - tabs in preamble
 

================================================================
Index: SPECS/dict-idp.spec
diff -u SPECS/dict-idp.spec:1.20 SPECS/dict-idp.spec:1.21
--- SPECS/dict-idp.spec:1.20	Mon Feb 12 22:23:53 2007
+++ SPECS/dict-idp.spec	Mon Mar 12 01:16:52 2007
@@ -13,7 +13,7 @@
 Name:		dict-%{dictname}
 Version:	19990219
 # Last update on their site
-Release:	3
+Release:	4
 License:	GPL
 # is this '#This file is free to use and modify. Thank you for using the IDP.'
 # compatible w/ Gnu GPL ???
@@ -39,6 +39,7 @@
 URL:		http://www.june29.com/IDP/
 BuildRequires:	dictfmt
 BuildRequires:	dictzip
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
 Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -192,63 +193,51 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post %{dict1}
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict1}
-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
 
 %post %{dict2}
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict2}
-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
 
 %post %{dict3}
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict3}
-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
 
 %post %{dict4}
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict4}
-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
 
 %post %{dict5}
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict5}
-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
 
 %post %{dict6}
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun %{dict6}
-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 %{dict1}
@@ -287,6 +276,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.21  2007/03/12 00:16:52  glen
+- rel 4 (use %service)
+
 Revision 1.20  2007/02/12 21:23:53  glen
 - tabs in preamble
 
@@ -342,7 +334,7 @@
 - fixed build, BR: dictfmt
 
 Revision 1.4  2002/07/26 10:12:46  qboosh
-- added missing %%prep section header
+- added missing %prep section header
 
 Revision 1.3  2002/07/18 11:29:33  ankry
 - typos in Sources
@@ -351,4 +343,4 @@
 - cosmetics.
 
 Revision 1.1  2002/07/17 00:53:34  hunter
--NYF !, someone w/ big pipe pls fetch the files.
+- NYF !, someone w/ big pipe pls fetch the files.

================================================================
Index: SPECS/dict-vietanh.spec
diff -u SPECS/dict-vietanh.spec:1.11 SPECS/dict-vietanh.spec:1.12
--- SPECS/dict-vietanh.spec:1.11	Mon Feb 12 22:23:53 2007
+++ SPECS/dict-vietanh.spec	Mon Mar 12 01:16:52 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Słownik wietnamsko-angielski dla dictd
 Name:		dict-%{dictname}
 Version:	1.0
-Release:	3
+Release:	4
 License:	GPL (?)
 Group:		Applications/Dictionaries
 Source0:	http://vietlug.sourceforge.net/download/emacs/%{dictname}.index
@@ -13,6 +13,7 @@
 # Source1-md5:	4a4a9f37916d3db0d4ca3ab0e7381927
 URL:		http://vietlug.sourceforge.net/
 Requires:	%{_sysconfdir}/dictd
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -42,13 +43,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
@@ -62,6 +61,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2007/03/12 00:16:52  glen
+- rel 4 (use %service)
+
 Revision 1.11  2007/02/12 21:23:53  glen
 - tabs in preamble
 
@@ -84,7 +86,7 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.4  2003/02/11 11:54:15  qboosh
-- empty %%prep is sufficient for builder
+- empty %prep is sufficient for builder
 
 Revision 1.3  2003/02/09 20:26:33  kloczek
 - s/%setup -C/%setup -q -T -c/
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dict-anhviet.spec?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/SPECS/dict-bouvier.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/dict-gcide.spec?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SPECS/dict-idp.spec?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SPECS/dict-vietanh.spec?r1=1.11&r2=1.12&f=u

More information about the pld-cvs-commit mailing list