- sorted subpackages, cleanups

Changed files:
    dict-misc.spec -> 1.13

diff --git a/dict-misc.spec b/dict-misc.spec
index d2a7b9005c276f87e7760ada3f2d1d961f1e19f5..50cea1fbd3a621354ef042af7d4577614a140ae5 100644 (file)
--- a/dict-misc.spec
+++ b/dict-misc.spec
@@ -6,16 +6,13 @@ 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
-
+Source2:       http://wiretap.area.com/Gopher/Library/Classic/devils.txt
 URL:           http://www.dict.org/
-BuildRequires: dictzip
 BuildRequires: autoconf
-Requires:      dictd 
+BuildRequires: dictzip
+Requires:      dictd
 Requires:      %{_sysconfdir}/dictd
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -27,46 +24,56 @@ server in the dictd package.
 Ten pakiet zawiera ró¿ne s³owniki do u¿ywania z serwerem s³ownika
 dictd.
 
-%package -n dict-hitchcock
-Summary:       hitchcock dictionary for DICTD
-Summary(pl):   S³ownik hitchcock dla 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
+S³ownik The Devil's Dictionary, zawieraj±cy cyniczne i lekcewa¿±ce
+opisy s³ów - do u¿ywania z serwerem s³ownika dictd.
+
+%package -n dict-easton
+Summary:       easton dictionary for DICTD
+Summary(pl):   S³ownik easton dla dictd
 Group:         Applications/Dictionaries
-Group(de):     Applikationen/Wörterbücher
-Group(pl):     Aplikacje/S³owniki
 Requires:      dictd 
 Requires:      %{_sysconfdir}/dictd
 
-%description -n dict-hitchcock
-This package contains hitchcock dictionaries for use by the dicitonary
+%description -n dict-easton
+This package contains easton dictionaries for use by the dicitonary
 server in the dictd package.
 
-%description -n dict-hitchcock -l pl
-Ten pakiet zawiera s³ownik hitchcock do u¿ywania z serwerem s³ownika
+%description -n dict-easton -l pl
+Ten pakiet zawiera s³ownik easton do u¿ywania z serwerem s³ownika
 dictd.
 
-%package -n dict-world95
-Summary:       world95 dictionary for DICTD
-Summary(pl):   S³ownik world95 dla dictd
+%package -n dict-elements
+Summary:       elements dictionary for DICTD
+Summary(pl):   S³ownik elements dla dictd
 Group:         Applications/Dictionaries
-Group(de):     Applikationen/Wörterbücher
-Group(pl):     Aplikacje/S³owniki
 Requires:      dictd 
 Requires:      %{_sysconfdir}/dictd
 
-%description -n dict-world95
-This package contains world95 dictionaries for use by the dicitonary
+%description -n dict-elements
+This package contains elements dictionaries for use by the dicitonary
 server in the dictd package.
 
-%description -n dict-world95 -l pl
-Ten pakiet zawiera s³ownik world95 do u¿ywania z serwerem s³ownika
+%description -n dict-elements -l pl
+Ten pakiet zawiera s³ownik elements do u¿ywania z serwerem s³ownika
 dictd.
 
 %package -n dict-foldoc
 Summary:       foldoc dictionary for DICTD
 Summary(pl):   S³ownik foldoc dla dictd
 Group:         Applications/Dictionaries
-Group(de):     Applikationen/Wörterbücher
-Group(pl):     Aplikacje/S³owniki
 Requires:      dictd 
 Requires:      %{_sysconfdir}/dictd
 
@@ -78,47 +85,28 @@ server in the dictd package.
 Ten pakiet zawiera s³ownik foldoc do u¿ywania z serwerem s³ownika
 dictd.
 
-%package -n dict-easton
-Summary:       easton dictionary for DICTD
-Summary(pl):   S³ownik easton dla dictd
+%package -n dict-hitchcock
+Summary:       hitchcock dictionary for DICTD
+Summary(pl):   S³ownik hitchcock dla dictd
 Group:         Applications/Dictionaries
-Group(de):     Applikationen/Wörterbücher
-Group(pl):     Aplikacje/S³owniki
 Requires:      dictd 
 Requires:      %{_sysconfdir}/dictd
 
-%description -n dict-easton
-This package contains easton dictionaries for use by the dicitonary
+%description -n dict-hitchcock
+This package contains hitchcock dictionaries for use by the dicitonary
 server in the dictd package.
 
-%description -n dict-easton -l pl
-Ten pakiet zawiera s³ownik easton do u¿ywania z serwerem s³ownika
+%description -n dict-hitchcock -l pl
+Ten pakiet zawiera s³ownik hitchcock do u¿ywania z serwerem s³ownika
 dictd.
 
-%package -n dict-elements
-Summary:       elements dictionary for DICTD
-Summary(pl):   S³ownik elements dla dictd
+%package -n dict-journo
+Summary:       Journalism dictionary for DICTD
+Summary(pl):   S³ownik Journalism dla dictd
 Group:         Applications/Dictionaries
-Group(de):     Applikationen/Wörterbücher
-Group(pl):     Aplikacje/S³owniki
-Requires:      dictd 
+Requires:      dictd
 Requires:      %{_sysconfdir}/dictd
 
-%description -n dict-elements
-This package contains elements dictionaries for use by the dicitonary
-server in the dictd package.
-
-%description -n dict-elements -l pl
-Ten pakiet zawiera s³ownik elements do u¿ywania z serwerem s³ownika
-dictd.
-
-%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.
@@ -127,20 +115,20 @@ server in the dictd package.
 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
+%package -n dict-world95
+Summary:       world95 dictionary for DICTD
+Summary(pl):   S³ownik world95 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-world95
+This package contains world95 dictionaries for use by the dicitonary
+server in the dictd package.
 
-%description -n dict-devil -l pl
-The Devil's Dictionary.
+%description -n dict-world95 -l pl
+Ten pakiet zawiera s³ownik world95 do u¿ywania z serwerem s³ownika
+dictd.
 
 %prep 
 %setup -q -a1 
@@ -164,6 +152,7 @@ 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/
@@ -183,9 +172,14 @@ done;
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%postun -n dict-easton
+%post -n dict-devil
 if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2 || true
+    /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-easton
@@ -193,8 +187,7 @@ if [ -f /var/lock/subsys/dictd ]; then
        /etc/rc.d/init.d/dictd restart 1>&2
 fi
 
-
-%postun -n dict-elements
+%postun -n dict-easton
 if [ -f /var/lock/subsys/dictd ]; then
        /etc/rc.d/init.d/dictd restart 1>&2 || true
 fi
@@ -204,8 +197,7 @@ if [ -f /var/lock/subsys/dictd ]; then
        /etc/rc.d/init.d/dictd restart 1>&2
 fi
 
-
-%postun -n dict-foldoc
+%postun -n dict-elements
 if [ -f /var/lock/subsys/dictd ]; then
        /etc/rc.d/init.d/dictd restart 1>&2 || true
 fi
@@ -215,8 +207,7 @@ if [ -f /var/lock/subsys/dictd ]; then
        /etc/rc.d/init.d/dictd restart 1>&2
 fi
 
-
-%postun -n dict-hitchcock
+%postun -n dict-foldoc
 if [ -f /var/lock/subsys/dictd ]; then
        /etc/rc.d/init.d/dictd restart 1>&2 || true
 fi
@@ -226,9 +217,9 @@ if [ -f /var/lock/subsys/dictd ]; then
        /etc/rc.d/init.d/dictd restart 1>&2
 fi
 
-%postun -n dict-journo
+%postun -n dict-hitchcock
 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
 
 %post -n dict-journo
@@ -236,9 +227,9 @@ if [ -f /var/lock/subsys/dictd ]; then
        /etc/rc.d/init.d/dictd restart 1>&2
 fi
 
-%postun -n dict-world95
+%postun -n dict-journo
 if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2 || true
+       /etc/rc.d/init.d/dictd restart 1>&2
 fi
 
 %post -n dict-world95
@@ -246,32 +237,16 @@ 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
+%postun -n dict-world95
 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 -n dict-hitchcock
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/hitchcock.dictconf
-%{_datadir}/dictd/hitchcock*
-
-%files -n dict-world95
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/world95.dictconf
-%{_datadir}/dictd/world95.*
-
-%files -n dict-foldoc
+%files -n dict-devil
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/foldoc.dictconf
-%{_datadir}/dictd/foldoc.*
-
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/devil.dictconf
+%{_datadir}/dictd/devil.*
+        
 %files -n dict-easton
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/easton.dictconf
@@ -282,13 +257,22 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/elements.dictconf
 %{_datadir}/dictd/elements.*
 
+%files -n dict-foldoc
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/foldoc.dictconf
+%{_datadir}/dictd/foldoc.*
+
+%files -n dict-hitchcock
+%defattr(644,root,root,755)
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/hitchcock.dictconf
+%{_datadir}/dictd/hitchcock*
+
 %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
+%files -n dict-world95
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/devil.dictconf
-%{_datadir}/dictd/devil.*
-        
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/world95.dictconf
+%{_datadir}/dictd/world95.*