- cosmetics,

- unified config entries and dict-* specs appearance.

Changed files:
    dict-gazetteer.spec -> 1.5

diff --git a/dict-gazetteer.spec b/dict-gazetteer.spec
index 9062bbaef7567d1fd86cc32715d192dedf87d136..c8b07b2f97f6c3de57d621c05764423a5e141a0d 100644 (file)
--- a/dict-gazetteer.spec
+++ b/dict-gazetteer.spec
@@ -9,11 +9,11 @@ Group:                Applications/Dictionaries
 Source0:       ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
 Patch0:                %{name}-linux-sparc.patch
 URL:           http://www.dict.org/
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-BuildRequires: dictzip
 BuildRequires: autoconf
+BuildRequires: dictzip
 Requires:      dictd
 Requires:      %{_sysconfdir}/dictd
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This package contains place names, population and location information
@@ -43,25 +43,24 @@ install -d $RPM_BUILD_ROOT{%{_datadir}/dictd/,%{_sysconfdir}/dictd}
 dictprefix=%{_datadir}/dictd/%{dictname}
 echo "# U.S. Gazetteer
 database %{dictname} {
-    data  \"$dictprefix.dict.dz\"
-    index \"$dictprefix.index\"
-}
-" > $RPM_BUILD_ROOT%{_sysconfdir}/dictd/%{dictname}.dictconf
+       data  \"$dictprefix.dict.dz\"
+       index \"$dictprefix.index\"
+}" > $RPM_BUILD_ROOT%{_sysconfdir}/dictd/%{dictname}.dictconf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%postun
+%post
 if [ -f /var/lock/subsys/dictd ]; then
        /etc/rc.d/init.d/dictd restart 1>&2
 fi
 
-%post
+%postun
 if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2
+       /etc/rc.d/init.d/dictd restart 1>&2 || true
 fi
 
 %files
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/*.dictconf
-%{_datadir}/dictd/%{dictname}*
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/%{dictname}.dictconf
+%{_datadir}/dictd/%{dictname}.*