- /etc/dictd is used instead of modify /etc/dictd.conf in %post

- release 2

Changed files:
    dict-jargon.spec -> 1.4

diff --git a/dict-jargon.spec b/dict-jargon.spec
index 0136017354dc20f69f72e11b1498eee683489d82..0e436460fcaf7b74ecce43484369c037f83328f4 100644 (file)
--- a/dict-jargon.spec
+++ b/dict-jargon.spec
@@ -2,7 +2,7 @@
 Summary:       The On-Line Hacker Jargon File dictionary for dictd
 Name:          dict-%{dictname}
 Version:       4.2.0
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/Dictionaries
 Group(pl):     Aplikacje/S³owniki
@@ -11,6 +11,7 @@ Source0:      ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: dictzip
 Requires:      dictd 
+Requires:      %{_sysconfdir}/dictd
 BuildArch:     noarch
 
 %description 
@@ -26,26 +27,31 @@ formatted for use by the dictionary server in the dictd package.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/dictd/
+install -d $RPM_BUILD_ROOT{%{_datadir}/dictd/,%{_sysconfdir}/dictd}
+%{__make} install dictdir="$RPM_BUILD_ROOT%{_datadir}/dictd/"
 
-DICTDIR="$RPM_BUILD_ROOT%{_datadir}/dictd/"
-%{__make} install dictdir="$DICTDIR" 
+dictprefix=%{_datadir}/dictd/%{dictname}
+echo "# The On-Line Hacker Jargon File dictionary
+database %{dictname} {
+    data  \"$dictprefix.dict.dz\"
+    index \"$dictprefix.index\" 
+}
+" > $RPM_BUILD_ROOT%{_sysconfdir}/dictd/%{dictname}.dictconf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%postun
+if [ -f /var/lock/subsys/dictd ]; then
+       /etc/rc.d/init.d/dictd restart 1>&2
+fi
+
 %post
-prefix=%{_datadir}/dictd/%{dictname}
-
-if ! grep ' %{dictname} ' /etc/dictd.conf >/dev/null; then 
-   echo "Edit /etc/dictd.conf to see %{dictname} dictionary under dictd"
-echo "# Uncommment this to configure The On-Line Hacker Jargon File dictionary
-#database %{dictname} {
-#    data  \"$prefix.dict.dz\"
-#    index \"$prefix.index\" }
-" >> /etc/dictd.conf
+if [ -f /var/lock/subsys/dictd ]; then
+       /etc/rc.d/init.d/dictd restart 1>&2
 fi
 
 %files
 %defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/*.dictconf
 %{_datadir}/dictd/%{dictname}*