-added devils and journalism dictrionaries.

Changed files:
    dict-misc.spec -> 1.12

diff --git a/dict-misc.spec b/dict-misc.spec
index b8ceab13cdb06756463a916c82e3dad7c3fb1534..d2a7b9005c276f87e7760ada3f2d1d961f1e19f5 100644 (file)
--- a/dict-misc.spec
+++ b/dict-misc.spec
@@ -6,15 +6,20 @@ Version:      1.5
 Release:       1
 License:       GPL
 Group:         Applications/Dictionaries
+Group(de):     Applikationen/Wörterbücher
+Group(pl):     Aplikacje/S³owniki
 Source0:       ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
+Source1:       journo-1.1.tar.gz
+Source2:    http://wiretap.area.com/Gopher/Library/Classic/devils.txt
+
 URL:           http://www.dict.org/
 BuildRequires: dictzip
 BuildRequires: autoconf
-Requires:      dictd
+Requires:      dictd 
 Requires:      %{_sysconfdir}/dictd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description
+%description 
 This package contains misc dictionaries for use by the dictionary
 server in the dictd package.
 
@@ -26,7 +31,9 @@ dictd.
 Summary:       hitchcock dictionary for DICTD
 Summary(pl):   S³ownik hitchcock dla dictd
 Group:         Applications/Dictionaries
-Requires:      dictd
+Group(de):     Applikationen/Wörterbücher
+Group(pl):     Aplikacje/S³owniki
+Requires:      dictd 
 Requires:      %{_sysconfdir}/dictd
 
 %description -n dict-hitchcock
@@ -41,7 +48,9 @@ dictd.
 Summary:       world95 dictionary for DICTD
 Summary(pl):   S³ownik world95 dla dictd
 Group:         Applications/Dictionaries
-Requires:      dictd
+Group(de):     Applikationen/Wörterbücher
+Group(pl):     Aplikacje/S³owniki
+Requires:      dictd 
 Requires:      %{_sysconfdir}/dictd
 
 %description -n dict-world95
@@ -56,7 +65,9 @@ dictd.
 Summary:       foldoc dictionary for DICTD
 Summary(pl):   S³ownik foldoc dla dictd
 Group:         Applications/Dictionaries
-Requires:      dictd
+Group(de):     Applikationen/Wörterbücher
+Group(pl):     Aplikacje/S³owniki
+Requires:      dictd 
 Requires:      %{_sysconfdir}/dictd
 
 %description -n dict-foldoc
@@ -71,7 +82,9 @@ dictd.
 Summary:       easton dictionary for DICTD
 Summary(pl):   S³ownik easton dla dictd
 Group:         Applications/Dictionaries
-Requires:      dictd
+Group(de):     Applikationen/Wörterbücher
+Group(pl):     Aplikacje/S³owniki
+Requires:      dictd 
 Requires:      %{_sysconfdir}/dictd
 
 %description -n dict-easton
@@ -86,7 +99,9 @@ dictd.
 Summary:       elements dictionary for DICTD
 Summary(pl):   S³ownik elements dla dictd
 Group:         Applications/Dictionaries
-Requires:      dictd
+Group(de):     Applikationen/Wörterbücher
+Group(pl):     Aplikacje/S³owniki
+Requires:      dictd 
 Requires:      %{_sysconfdir}/dictd
 
 %description -n dict-elements
@@ -97,28 +112,71 @@ server in the dictd package.
 Ten pakiet zawiera s³ownik elements do u¿ywania z serwerem s³ownika
 dictd.
 
-%prep
-%setup -q
+%package -n dict-journo
+Summary:    Journalism dictionary for DICTD
+Summary(pl):    S³ownik Journalism dla dictd
+Group:      Applications/Dictionaries
+Requires:   dictd
+Requires:   %{_sysconfdir}/dictd
+
+%description -n dict-journo
+This package contains journo dictionaries for use by the dicitonary
+server in the dictd package.
+
+%description -n dict-journo -l pl
+Ten pakiet zawiera s³ownik journo do u¿ywania z serwerem s³ownika
+dictd.
+
+%package -n dict-devil
+Summary:    Devils dictionary for DICTD
+Summary(pl):    S³ownik Devils dla dictd
+Group:      Applications/Dictionaries
+Requires:   dictd
+Requires:   %{_sysconfdir}/dictd
+
+%description -n dict-devil
+This package contains The Devil's Dictionary, a cynical and irreverent
+dictionary of common words, formatted for use by the dictionary server
+in the dictd package.
+
+%description -n dict-devil -l pl
+The Devil's Dictionary.
+
+%prep 
+%setup -q -a1 
+cp %{SOURCE2} ./
 
 %build
-%{__autoconf}
-%configure
-%{__make} db
+autoconf
+%configure 
+%{__make} db 
+
+mv journo-1.1/journalism.dict ./journalism.txt
+./dictfmt -f -u "http://dsl.org/lit/" -s Journalism journo < journalism.txt
+dictzip journo.dict
+
+sed  's/^[[:upper:]]\{2,\}/:&:/' ./devils.txt | ./dictfmt  \
+ -j -u http://wiretap.area.com/Gopher/Library/Classic/devils.txt \
+  -s "The Devil's Dictionary (1881-1906)" devil
+
+dictzip devil.dict
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_datadir}/dictd/,%{_sysconfdir}/dictd}
 %{__make} install dictdir="$RPM_BUILD_ROOT%{_datadir}/dictd/"
+install journo.* $RPM_BUILD_ROOT%{_datadir}/dictd/
+install devil.* $RPM_BUILD_ROOT%{_datadir}/dictd/
 
 # jargon has separate package
 rm -f $RPM_BUILD_ROOT%{_datadir}/dictd/jargon.*
 
-for i in easton elements foldoc hitchcock world95; do
+for i in easton elements foldoc hitchcock world95 journo devil; do
 dictprefix=%{_datadir}/dictd/$i
 echo "# Misc Dictionaries - $i
 database $i {
     data  \"$dictprefix.dict.dz\"
-    index \"$dictprefix.index\"
+    index \"$dictprefix.index\" 
 }" > $RPM_BUILD_ROOT%{_sysconfdir}/dictd/$i.dictconf
 done;
 
@@ -168,6 +226,15 @@ if [ -f /var/lock/subsys/dictd ]; then
        /etc/rc.d/init.d/dictd restart 1>&2
 fi
 
+%postun -n dict-journo
+if [ -f /var/lock/subsys/dictd ]; then
+       /etc/rc.d/init.d/dictd restart 1>&2
+fi
+
+%post -n dict-journo
+if [ -f /var/lock/subsys/dictd ]; then
+       /etc/rc.d/init.d/dictd restart 1>&2
+fi
 
 %postun -n dict-world95
 if [ -f /var/lock/subsys/dictd ]; then
@@ -179,6 +246,17 @@ if [ -f /var/lock/subsys/dictd ]; then
        /etc/rc.d/init.d/dictd restart 1>&2
 fi
 
+%postun -n dict-devil
+if [ -f /var/lock/subsys/dictd ]; then
+   /etc/rc.d/init.d/dictd restart 1>&2 || true
+fi
+
+%post -n dict-devil
+if [ -f /var/lock/subsys/dictd ]; then
+    /etc/rc.d/init.d/dictd restart 1>&2
+fi
+
+
 %files -n dict-hitchcock
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/hitchcock.dictconf
@@ -203,3 +281,14 @@ fi
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/elements.dictconf
 %{_datadir}/dictd/elements.*
+
+%files -n dict-journo
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/journo.dictconf
+%{_datadir}/dictd/journo.*
+
+%files -n dict-devil
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/devil.dictconf
+%{_datadir}/dictd/devil.*
+