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

[glen]

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

---- Files affected:
SPECS:
   dict-sap.spec (1.20 -> 1.20.2.1) 

---- Diffs:

================================================================
Index: SPECS/dict-sap.spec
diff -u SPECS/dict-sap.spec:1.20 SPECS/dict-sap.spec:1.20.2.1
--- SPECS/dict-sap.spec:1.20	Thu Aug 19 17:51:15 2004
+++ SPECS/dict-sap.spec	Mon Mar 12 01:57:49 2007
@@ -3,18 +3,20 @@
 Summary(pl):	sap - słownik angielsko-polski i odwrotnie dla dictd
 Name:		dict-sap
 Version:	0.1b_0.1
-Release:	3
+Release:	5
 License:	GPL
 Group:		Applications/Dictionaries
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	7d53db1c78a0662d1ebb10b0912caa9a
 URL:		http://www.dict.org/
+BuildRequires:	%{_bindir}/perl
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	dictzip
-BuildRequires:	%{_bindir}/perl
-Requires:	dictd
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires:	%{_sysconfdir}/dictd
+Requires:	dict
+Requires:	dictd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,8 +32,8 @@
 
 %build
 %{__autoconf}
-cp -f %{_datadir}/automake/install-sh .
-cp -f %{_datadir}/automake/config.sub .
+cp -f /usr/share/automake/install-sh .
+cp -f /usr/share/automake/config.sub .
 %configure
 %{__make} db
 
@@ -55,18 +57,16 @@
 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)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/sap_*.dictconf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dictd/sap_*.dictconf
 %attr(755,root,root) %{_bindir}/sapdict
 %{_datadir}/dictd/sap_*
 
@@ -76,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20.2.1  2007/03/12 00:57:49  glen
+- HEAD merge
+
 Revision 1.20  2004/08/19 15:51:15  averne
 - rel++
 
@@ -113,12 +116,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.
@@ -128,7 +131,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-sap.spec?r1=1.20&r2=1.20.2.1&f=u