SPECS: dict-ksocrat.spec, dict-mueller24.spec, dictd.spec - rel 2 ...

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

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

---- Files affected:
SPECS:
   dict-ksocrat.spec (1.4 -> 1.5) , dict-mueller24.spec (1.7 -> 1.8) , dictd.spec (1.60 -> 1.61) 

---- Diffs:

================================================================
Index: SPECS/dict-ksocrat.spec
diff -u SPECS/dict-ksocrat.spec:1.4 SPECS/dict-ksocrat.spec:1.5
--- SPECS/dict-ksocrat.spec:1.4	Mon Feb 12 22:23:53 2007
+++ SPECS/dict-ksocrat.spec	Mon Mar 12 01:16:41 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Słownik angielsko<->rosyjski dla dictd
 Name:		dict-%{dictname}
 Version:	1.0.1
-Release:	1
+Release:	2
 License:	for use with KSocrat only
 Group:		Applications/Dictionaries
 Source0:	http://webua.net/zavolzhsky/download/%{dictname}-enru-dic-%{version}.tar.bz2
@@ -15,6 +15,7 @@
 Patch0:		%{dictname}-enru.patch
 BuildRequires:	dictfmt
 BuildRequires:	dictzip
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
 Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -89,23 +90,19 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post enru
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun enru
-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 ruen
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
 
 %postun ruen
-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 enru
@@ -128,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2007/03/12 00:16:41  glen
+- rel 2 (use %service)
+
 Revision 1.4  2007/02/12 21:23:53  glen
 - tabs in preamble
 

================================================================
Index: SPECS/dict-mueller24.spec
diff -u SPECS/dict-mueller24.spec:1.7 SPECS/dict-mueller24.spec:1.8
--- SPECS/dict-mueller24.spec:1.7	Mon Feb 12 22:23:53 2007
+++ SPECS/dict-mueller24.spec	Mon Mar 12 01:16:41 2007
@@ -4,7 +4,7 @@
 Summary(pl.UTF-8):	Słownik angielsko-rosyjski dla dictd
 Name:		dict-%{dictname}
 Version:	1.6
-Release:	1
+Release:	2
 License:	unknown
 Group:		Applications/Dictionaries
 Source0:	http://mueller-dic.chat.ru/Mueller24.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 --src-data usr/local/share/dict/Mueller24.koi mueller24.data
 ./to-dict --data-dict mueller24.data mueller24 && rm -f mueller24.data
 
@@ -53,13 +54,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
@@ -75,6 +74,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007/03/12 00:16:41  glen
+- rel 2 (use %service)
+
 Revision 1.7  2007/02/12 21:23:53  glen
 - tabs in preamble
 

================================================================
Index: SPECS/dictd.spec
diff -u SPECS/dictd.spec:1.60 SPECS/dictd.spec:1.61
--- SPECS/dictd.spec:1.60	Mon Feb 12 22:23:53 2007
+++ SPECS/dictd.spec	Mon Mar 12 01:16:41 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Serwer bazy słowników
 Name:		dictd
 Version:	1.10.4
-Release:	1
+Release:	2
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://dl.sourceforge.net/dict/%{name}-%{version}.tar.gz
@@ -19,12 +19,13 @@
 BuildRequires:	judy-devel
 BuildRequires:	libdbi-devel
 BuildRequires:	perl-base
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
-Requires:	/sbin/chkconfig
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags_ia32	 -fomit-frame-pointer 
+%define		specflags_ia32	 -fomit-frame-pointer
 
 %description
 Server for the Dictionary Server Protocol (DICT), a TCP transaction
@@ -171,17 +172,11 @@
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
-fi
+%service dictd restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop >&2
-	fi
+	%service dictd stop
 	/sbin/chkconfig --del %{name}
 fi
 
@@ -238,6 +233,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.61  2007/03/12 00:16:41  glen
+- rel 2 (use %service)
+
 Revision 1.60  2007/02/12 21:23:53  glen
 - tabs in preamble
 
@@ -337,7 +335,7 @@
 - adapterized
 
 Revision 1.29  2002/12/07 14:32:49  ankry
-- fix improper usage of %%{_sysconfdir}
+- fix improper usage of %{_sysconfdir}
 
 Revision 1.28  2002/09/27 17:20:40  gotar
 - changed dictd group from Daemons to Networking/Daemons,
@@ -360,15 +358,15 @@
 - stbr
 
 Revision 1.24  2002/05/21 23:12:56  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.23  2002/05/05 17:50:18  kloczek
 - release 6.
 
 Revision 1.22  2002/04/25 16:11:43  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.21  2002/02/23 01:47:49  kloczek
 - adapterized.
@@ -378,7 +376,7 @@
   Group field using gettext).
 
 Revision 1.19  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.18  2001/11/25 23:02:21  undefine
 - UID/GID=nobody
@@ -388,7 +386,7 @@
 Revision 1.17  2001/11/17 20:35:18  qboosh
 - opt,system-zlib patches: use optflags and system zlib
 - BuildRequires: bison, zlib-devel
-- fixed %%post (s/subsystem/subsys/)
+- fixed %post (s/subsystem/subsys/)
 - release 4
 
 Revision 1.16  2001/11/07 16:05:43  kloczek
@@ -421,7 +419,7 @@
 - reverting last change: removing new macros from %p{re,ost}{,un}
 
 Revision 1.7  2001/04/30 16:05:16  kloczek
-- added using %%{rpmcflags} macro.
+- added using %{rpmcflags} macro.
 
 Revision 1.6  2001/03/17 14:31:06  undefine
 - update to 1.5.5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dict-ksocrat.spec?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SPECS/dict-mueller24.spec?r1=1.7&r2=1.8&f=u
    http://cvs.pld-linux.org/SPECS/dictd.spec?r1=1.60&r2=1.61&f=u

More information about the pld-cvs-commit mailing list