SPECS (AC-branch): dict-freedict.spec - HEAD merge
glen
glen at pld-linux.org
Mon Mar 12 01:28:38 CET 2007
Author: glen Date: Mon Mar 12 00:28:38 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- HEAD merge
---- Files affected:
SPECS:
dict-freedict.spec (1.25 -> 1.25.2.1)
---- Diffs:
================================================================
Index: SPECS/dict-freedict.spec
diff -u SPECS/dict-freedict.spec:1.25 SPECS/dict-freedict.spec:1.25.2.1
--- SPECS/dict-freedict.spec:1.25 Tue Sep 7 19:48:28 2004
+++ SPECS/dict-freedict.spec Mon Mar 12 01:28:33 2007
@@ -75,7 +75,7 @@
Summary(pl): Darmowe dwujęzykowe słowniki dla dictd
Name: dict-%{dictname}
Version: 20030508
-Release: 3
+Release: 4
License: GPL
Group: Applications/Dictionaries
# also at ftp://ftp.sourceforge.net/pub/sourceforge/freedict/ if following wouldn't work
@@ -194,8 +194,8 @@
URL: http://www.freedict.de/
BuildRequires: dictfmt
BuildRequires: dictzip
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -211,8 +211,8 @@
Summary: The %{dict0} dictionary for dictd
Summary(pl): Słownik %{dict0} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict0}
This package contains %{dict0} dictionaries for use by the dictionary
@@ -226,8 +226,8 @@
Summary: The %{dict1} dictionary for dictd
Summary(pl): Słownik %{dict1} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict1}
This package contains %{dict1} dictionaries for use by the dictionary
@@ -241,8 +241,8 @@
Summary: The %{dict2} dictionary for dictd
Summary(pl): Słownik %{dict2} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict2}
This package contains %{dict2} dictionaries for use by the dictionary
@@ -256,8 +256,8 @@
Summary: The %{dict3} dictionary for dictd
Summary(pl): Słownik %{dict3} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict3}
This package contains %{dict3} dictionaries for use by the dictionary
@@ -271,8 +271,8 @@
Summary: The %{dict4} dictionary for dictd
Summary(pl): Słownik %{dict4} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict4}
This package contains %{dict4} dictionaries for use by the dictionary
@@ -286,8 +286,8 @@
Summary: The %{dict5} dictionary for dictd
Summary(pl): Słownik %{dict5} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict5}
This package contains %{dict5} dictionaries for use by the dictionary
@@ -301,8 +301,8 @@
Summary: The %{dict6} dictionary for dictd
Summary(pl): Słownik %{dict6} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict6}
This package contains %{dict6} dictionaries for use by the dictionary
@@ -316,8 +316,8 @@
Summary: The %{dict7} dictionary for dictd
Summary(pl): Słownik %{dict7} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict7}
This package contains %{dict7} dictionaries for use by the dictionary
@@ -331,8 +331,8 @@
Summary: The %{dict8} dictionary for dictd
Summary(pl): Słownik %{dict8} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict8}
This package contains %{dict8} dictionaries for use by the dictionary
@@ -346,8 +346,8 @@
Summary: The %{dict9} dictionary for dictd
Summary(pl): Słownik %{dict9} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict9}
This package contains %{dict9} dictionaries for use by the dictionary
@@ -361,8 +361,8 @@
Summary: The %{dict10} dictionary for dictd
Summary(pl): Słownik %{dict10} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict10}
This package contains %{dict10} dictionaries for use by the dictionary
@@ -376,8 +376,8 @@
Summary: The %{dict11} dictionary for dictd
Summary(pl): Słownik %{dict11} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict11}
This package contains %{dict11} dictionaries for use by the dictionary
@@ -391,8 +391,8 @@
Summary: The %{dict12} dictionary for dictd
Summary(pl): Słownik %{dict12} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict12}
This package contains %{dict12} dictionaries for use by the dictionary
@@ -406,8 +406,8 @@
Summary: The %{dict13} dictionary for dictd
Summary(pl): Słownik %{dict13} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict13}
This package contains %{dict13} dictionaries for use by the dictionary
@@ -421,8 +421,8 @@
Summary: The %{dict14} dictionary for dictd
Summary(pl): Słownik %{dict14} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict14}
This package contains %{dict14} dictionaries for use by the dictionary
@@ -436,8 +436,8 @@
Summary: The %{dict15} dictionary for dictd
Summary(pl): Słownik %{dict15} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict15}
This package contains %{dict15} dictionaries for use by the dictionary
@@ -451,8 +451,8 @@
Summary: The %{dict16} dictionary for dictd
Summary(pl): Słownik %{dict16} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict16}
This package contains %{dict16} dictionaries for use by the dictionary
@@ -466,8 +466,8 @@
Summary: The %{dict17} dictionary for dictd
Summary(pl): Słownik %{dict17} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict17}
This package contains %{dict17} dictionaries for use by the dictionary
@@ -481,8 +481,8 @@
Summary: The %{dict18} dictionary for dictd
Summary(pl): Słownik %{dict18} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict18}
This package contains %{dict18} dictionaries for use by the dictionary
@@ -496,8 +496,8 @@
Summary: The %{dict19} dictionary for dictd
Summary(pl): Słownik %{dict19} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict19}
This package contains %{dict19} dictionaries for use by the dictionary
@@ -511,8 +511,8 @@
Summary: The %{dict20} dictionary for dictd
Summary(pl): Słownik %{dict20} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict20}
This package contains %{dict20} dictionaries for use by the dictionary
@@ -526,8 +526,8 @@
Summary: The %{dict21} dictionary for dictd
Summary(pl): Słownik %{dict21} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict21}
This package contains %{dict21} dictionaries for use by the dictionary
@@ -541,8 +541,8 @@
Summary: The %{dict22} dictionary for dictd
Summary(pl): Słownik %{dict22} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict22}
This package contains %{dict22} dictionaries for use by the dictionary
@@ -556,8 +556,8 @@
Summary: The %{dict23} dictionary for dictd
Summary(pl): Słownik %{dict23} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict23}
This package contains %{dict23} dictionaries for use by the dictionary
@@ -571,8 +571,8 @@
Summary: The %{dict24} dictionary for dictd
Summary(pl): Słownik %{dict24} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict24}
This package contains %{dict24} dictionaries for use by the dictionary
@@ -586,8 +586,8 @@
Summary: The %{dict25} dictionary for dictd
Summary(pl): Słownik %{dict25} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict25}
This package contains %{dict25} dictionaries for use by the dictionary
@@ -601,8 +601,8 @@
Summary: The %{dict26} dictionary for dictd
Summary(pl): Słownik %{dict26} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict26}
This package contains %{dict26} dictionaries for use by the dictionary
@@ -616,8 +616,8 @@
Summary: The %{dict27} dictionary for dictd
Summary(pl): Słownik %{dict27} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict27}
This package contains %{dict27} dictionaries for use by the dictionary
@@ -631,8 +631,8 @@
Summary: The %{dict28} dictionary for dictd
Summary(pl): Słownik %{dict28} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict28}
This package contains %{dict28} dictionaries for use by the dictionary
@@ -646,8 +646,8 @@
Summary: The %{dict29} dictionary for dictd
Summary(pl): Słownik %{dict29} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict29}
This package contains %{dict29} dictionaries for use by the dictionary
@@ -661,8 +661,8 @@
Summary: The %{dict30} dictionary for dictd
Summary(pl): Słownik %{dict30} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict30}
This package contains %{dict30} dictionaries for use by the dictionary
@@ -676,8 +676,8 @@
Summary: The %{dict31} dictionary for dictd
Summary(pl): Słownik %{dict31} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict31}
This package contains %{dict31} dictionaries for use by the dictionary
@@ -691,8 +691,8 @@
Summary: The %{dict32} dictionary for dictd
Summary(pl): Słownik %{dict32} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict32}
This package contains %{dict32} dictionaries for use by the dictionary
@@ -706,8 +706,8 @@
Summary: The %{dict33} dictionary for dictd
Summary(pl): Słownik %{dict33} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict33}
This package contains %{dict33} dictionaries for use by the dictionary
@@ -721,8 +721,8 @@
Summary: The %{dict34} dictionary for dictd
Summary(pl): Słownik %{dict34} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict34}
This package contains %{dict34} dictionaries for use by the dictionary
@@ -736,8 +736,8 @@
Summary: The %{dict35} dictionary for dictd
Summary(pl): Słownik %{dict35} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict35}
This package contains %{dict35} dictionaries for use by the dictionary
@@ -751,8 +751,8 @@
Summary: The %{dict36} dictionary for dictd
Summary(pl): Słownik %{dict36} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict36}
This package contains %{dict36} dictionaries for use by the dictionary
@@ -766,8 +766,8 @@
Summary: The %{dict37} dictionary for dictd
Summary(pl): Słownik %{dict37} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict37}
This package contains %{dict37} dictionaries for use by the dictionary
@@ -781,8 +781,8 @@
Summary: The %{dict38} dictionary for dictd
Summary(pl): Słownik %{dict38} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict38}
This package contains %{dict38} dictionaries for use by the dictionary
@@ -796,8 +796,8 @@
Summary: The %{dict39} dictionary for dictd
Summary(pl): Słownik %{dict39} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict39}
This package contains %{dict39} dictionaries for use by the dictionary
@@ -811,8 +811,8 @@
Summary: The %{dict40} dictionary for dictd
Summary(pl): Słownik %{dict40} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict40}
This package contains %{dict40} dictionaries for use by the dictionary
@@ -826,8 +826,8 @@
Summary: The %{dict41} dictionary for dictd
Summary(pl): Słownik %{dict41} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict41}
This package contains %{dict41} dictionaries for use by the dictionary
@@ -841,8 +841,8 @@
Summary: The %{dict42} dictionary for dictd
Summary(pl): Słownik %{dict42} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict42}
This package contains %{dict42} dictionaries for use by the dictionary
@@ -856,8 +856,8 @@
Summary: The %{dict43} dictionary for dictd
Summary(pl): Słownik %{dict43} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict43}
This package contains %{dict43} dictionaries for use by the dictionary
@@ -871,8 +871,8 @@
Summary: The %{dict44} dictionary for dictd
Summary(pl): Słownik %{dict44} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict44}
This package contains %{dict44} dictionaries for use by the dictionary
@@ -886,8 +886,8 @@
Summary: The %{dict45} dictionary for dictd
Summary(pl): Słownik %{dict45} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict45}
This package contains %{dict45} dictionaries for use by the dictionary
@@ -901,8 +901,8 @@
Summary: The %{dict46} dictionary for dictd
Summary(pl): Słownik %{dict46} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict46}
This package contains %{dict46} dictionaries for use by the dictionary
@@ -916,8 +916,8 @@
Summary: The %{dict47} dictionary for dictd
Summary(pl): Słownik %{dict47} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict47}
This package contains %{dict47} dictionaries for use by the dictionary
@@ -931,8 +931,8 @@
Summary: The %{dict48} dictionary for dictd
Summary(pl): Słownik %{dict48} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict48}
This package contains %{dict48} dictionaries for use by the dictionary
@@ -946,8 +946,8 @@
Summary: The %{dict49} dictionary for dictd
Summary(pl): Słownik %{dict49} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict49}
This package contains %{dict49} dictionaries for use by the dictionary
@@ -961,8 +961,8 @@
Summary: The %{dict50} dictionary for dictd
Summary(pl): Słownik %{dict50} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict50}
This package contains %{dict50} dictionaries for use by the dictionary
@@ -976,8 +976,8 @@
Summary: The %{dict51} dictionary for dictd
Summary(pl): Słownik %{dict51} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict51}
This package contains %{dict51} dictionaries for use by the dictionary
@@ -991,8 +991,8 @@
Summary: The %{dict52} dictionary for dictd
Summary(pl): Słownik %{dict52} dla dictd
Group: Applications/Dictionaries
-Requires: dictd
Requires: %{_sysconfdir}/dictd
+Requires: dictd
%description %{dict52}
This package contains %{dict52} dictionaries for use by the dictionary
@@ -1033,583 +1033,477 @@
rm -rf $RPM_BUILD_ROOT
%post %{dict0}
-if [ -f /var/lock/subsys/dictd ]; then
- /etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
%postun %{dict0}
-if [ -f /var/lock/subsys/dictd ]; then
- /etc/rc.d/init.d/dictd restart 1>&2 || true
+if [ "$1" = 0 ]; then
+ %service -q dictd restart
fi
%post %{dict1}
-if [ -f /var/lock/subsys/dictd ]; then
- /etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
%postun %{dict1}
-if [ -f /var/lock/subsys/dictd ]; then
- /etc/rc.d/init.d/dictd restart 1>&2 || true
+if [ "$1" = 0 ]; then
+ %service -q dictd restart
fi
%post %{dict2}
-if [ -f /var/lock/subsys/dictd ]; then
- /etc/rc.d/init.d/dictd restart 1>&2
-fi
+%service -q dictd restart
%postun %{dict2}
-if [ -f /var/lock/subsys/dictd ]; then
- /etc/rc.d/init.d/dictd restart 1>&2 || true
+if [ "$1" = 0 ]; then
+ %service -q dictd restart
fi
%post %{dict3}
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SPECS/dict-freedict.spec?r1=1.25&r2=1.25.2.1&f=u
More information about the pld-cvs-commit
mailing list