- HEAD merge

[packages/dict-wn.git] / dict-wn.spec

diff --git a/dict-wn.spec b/dict-wn.spec
index 2f7a6b6d4f004969d462af316d739ffd11057d1a..2edb62ae3ae14a5da4ef7794fa76cac569ba463c 100644 (file)
--- a/dict-wn.spec
+++ b/dict-wn.spec
@@ -1,61 +1,55 @@
 %define                dictname wn
-Summary:       WordNet lexical reference system formatted as dictionary for dictd
+Summary:       WordNet lexical reference system for dictd
 Summary(pl):   System referencji s³ownikowych WordNet dla dictd
-Name:          dict-wn
-Version:       1.5
-Release:       2
+Name:          dict-%{dictname}
+Version:       2.0
+Release:       3
 License:       Free to use, but see http://www.cogsci.princeton.edu/~wn/
 Group:         Applications/Dictionaries
-Source0:       ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
+# note: pre means preformatted
+Source0:       ftp://ftp.dict.org/pub/dict/pre/%{name}-%{version}-pre.tar.gz
+# Source0-md5: fcfedcc13815cde1e28103b61c05c168
 URL:           http://www.dict.org/
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-BuildRequires: dictzip
-BuildRequires: autoconf
-Requires:      dictd 
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      %{_sysconfdir}/dictd
+Requires:      dictd
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description 
-This package contains WordNet (r) 1.6 Lexical Database formatted for
+%description
+This package contains WordNet (r) %{version} Lexical Database formatted for
 use by the dictionary server in the dictd package.
 
 %description -l pl
-Ten pakiet zawiera leksykaln± bazê danych WordNet sformatowan± do
-u¿ywania z serwerem s³ownika dictd.
+Ten pakiet zawiera leksykaln± bazê danych WordNet (r) %{version} sformatowan±
+do u¿ywania z serwerem s³ownika dictd.
 
-%prep 
-%setup -q
-
-%build
-autoconf
-%configure 
-%{__make} db 
+%prep
+%setup -c -q
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/dictd/,%{_sysconfdir}/dictd}
-%{__make} install dictdir="$RPM_BUILD_ROOT%{_datadir}/dictd/"
+install -d $RPM_BUILD_ROOT{%{_datadir}/dictd,%{_sysconfdir}/dictd}
 
-dictprefix=%{_datadir}/dictd/wn
-echo "# WordNet 1.6 Lexical Database dictionary
+dictprefix=%{_datadir}/dictd/%{dictname}
+echo "# WordNet %{version} Lexical Database dictionary
 database %{dictname} {
-    data  \"$dictprefix.dict.dz\"
-    index \"$dictprefix.index\" 
+       data  \"$dictprefix.dict.dz\"
+       index \"$dictprefix.index\"
 }" > $RPM_BUILD_ROOT%{_sysconfdir}/dictd/%{dictname}.dictconf
+mv %{dictname}.* $RPM_BUILD_ROOT%{_datadir}/dictd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%postun
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2 || true
-fi
-
 %post
-if [ -f /var/lock/subsys/dictd ]; then
-       /etc/rc.d/init.d/dictd restart 1>&2
+%service -q dictd restart
+
+%postun
+if [ "$1" = 0 ]; then
+       %service -q dictd restart
 fi
 
 %files
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dictd/%{dictname}.dictconf
-%{_datadir}/dictd/%{dictname}*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dictd/%{dictname}.dictconf
+%{_datadir}/dictd/%{dictname}.*