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

---- Files affected:
SPECS:
   dict-gazetteer.spec (1.13 -> 1.13.2.1) 

---- Diffs:

================================================================
Index: SPECS/dict-gazetteer.spec
diff -u SPECS/dict-gazetteer.spec:1.13 SPECS/dict-gazetteer.spec:1.13.2.1
--- SPECS/dict-gazetteer.spec:1.13      Thu Aug 19 17:51:15 2004
+++ SPECS/dict-gazetteer.spec   Mon Mar 12 01:32:19 2007
@@ -4,7 +4,7 @@
 Summary(pl):   Słownik nazw geograficznych w USA dla dictd
 Name:          dict-%{dictname}
 Version:       1.3
-Release:       6
+Release:       7
 License:       GPL
 Group:         Applications/Dictionaries
 Source0:       ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
@@ -14,8 +14,9 @@
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: dictzip
-Requires:      dictd
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      %{_sysconfdir}/dictd
+Requires:      dictd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,18 +58,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/%{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"`)
@@ -77,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13.2.1  2007/03/12 00:32:19  glen
+- HEAD merge
+
 Revision 1.13  2004/08/19 15:51:15  averne
 - rel++
 
@@ -110,9 +112,9 @@
 - release 3
 
 Revision 1.3  2002/05/21 23:12:52  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.2  2002/05/10 21:43:10  kloczek
 - release 2.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dict-gazetteer.spec?r1=1.13&r2=1.13.2.1&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to