SPECS: dict-misc.spec - release 15: update foldoc, use %service ma...

[radek]

Author: radek                        Date: Sun Jun 11 17:22:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- release 15: update foldoc, use %service macros
- move devils and slownik to DF

---- Files affected:
SPECS:
   dict-misc.spec (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: SPECS/dict-misc.spec
diff -u SPECS/dict-misc.spec:1.42 SPECS/dict-misc.spec:1.43
--- SPECS/dict-misc.spec:1.42	Mon Dec 12 16:19:32 2005
+++ SPECS/dict-misc.spec	Sun Jun 11 19:22:31 2006
@@ -4,7 +4,7 @@
 Summary(pl):	Różne słowniki dla dictd
 Name:		dict-%{dictname}
 Version:	1.5
-Release:	14
+Release:	15
 License:	GPL
 Group:		Applications/Dictionaries
 Source0:	ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
@@ -12,9 +12,13 @@
 Source1:	http://dsl.org/faq/fjd/journo-1.1.tar.gz
 # Source1-md5:	e7ee9a7694e5640cca02da993839771a
 Source2:	http://wiretap.area.com/Gopher/Library/Classic/devils.txt
+# Source2-md5:	56b2918934d8f1162ec0f711df8c9669
 Source3:	http://ptm.linux.pl/slownik
+# Source3-md5:	7edc21ffad074041097e9f9f0e2c2b15
 Source4:	http://www.prime-project.org/dict/dict-world02--2003-02-15.tar.gz
 # Source4-md5:	344bd453d17536e281f1874cfd318c7d
+Source5:	http://foldoc.org/foldoc/Dictionary.gz
+# Source5-md5:	c93dcdd00ac3ba1436ffe3cff2a27493
 URL:		http://www.dict.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -165,6 +169,7 @@
 %setup -q -a1 -a4
 cp %{SOURCE2} ./
 cp %{SOURCE3} ./
+zcat %{SOURCE5} > data/Dictionary
 
 %build
 %{__autoconf}
@@ -218,84 +223,52 @@
 rm -rf $RPM_BUILD_ROOT
 
 %post -n dict-devil
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service dictd restart
 
 %postun -n dict-devil
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2 || true
-fi
+%service dictd restart
 
 %post -n dict-easton
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service dictd restart
 
 %postun -n dict-easton
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2 || true
-fi
+%service dictd restart
 
 %post -n dict-elements
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service dictd restart
 
 %postun -n dict-elements
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2 || true
-fi
+%service dictd restart
 
 %post -n dict-foldoc
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service dictd restart
 
 %postun -n dict-foldoc
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2 || true
-fi
+%service dictd restart
 
 %post -n dict-hitchcock
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service dictd restart
 
 %postun -n dict-hitchcock
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2 || true
-fi
+%service dictd restart
 
 %post -n dict-journo
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service dictd restart
 
 %postun -n dict-journo
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service dictd restart
 
 %post -n dict-ptm
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service dictd restart
 
 %postun -n dict-ptm
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service dictd restart
 
 %post -n dict-CIAworldbook
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service dictd restart
 
 %postun -n dict-CIAworldbook
-if [ -f /var/lock/subsys/dictd ]; then
-	/etc/rc.d/init.d/dictd restart 1>&2 || true
-fi
+%service dictd restart
 
 %files -n dict-devil
 %defattr(644,root,root,755)
@@ -343,6 +316,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2006/06/11 17:22:31  radek
+- release 15: update foldoc, use %service macros
+- move devils and slownik to DF
+
 Revision 1.42  2005/12/12 15:19:32  glen
 - adapterized (sorted %verify flags)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/dict-misc.spec?r1=1.42&r2=1.43&f=u