X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdictd.git;a=blobdiff_plain;f=dictd.spec;h=8a41521ad8fc6f61a6402203ed93cbaec89db828;hp=fabd0724a90a1eb7838c911952f47b58e32c6188;hb=HEAD;hpb=e64a8f95af81d0366dbad2ab56ad84d54fffdd57

diff --git a/dictd.spec b/dictd.spec
index fabd072..8a41521 100644
--- a/dictd.spec
+++ b/dictd.spec
@@ -1,29 +1,36 @@
 Summary:	Dictionary database server
 Summary(pl.UTF-8):	Serwer bazy słowników
 Name:		dictd
-Version:	1.10.4
-Release:	1
-License:	GPL
+Version:	1.12.1
+Release:	2
+License:	GPL v1+
 Group:		Networking/Daemons
-Source0:	http://dl.sourceforge.net/dict/%{name}-%{version}.tar.gz
-# Source0-md5:	1c0b7583e6fa25fd27fca5fca9ddb91f
+Source0:	http://downloads.sourceforge.net/dict/%{name}-%{version}.tar.gz
+# Source0-md5:	62696491174c22079f664830d07c0623
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
-Patch0:		%{name}-opt.patch
+Patch0:		%{name}-umask.patch
 URL:		http://www.dict.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	judy-devel
 BuildRequires:	libdbi-devel
+BuildRequires:	libmaa-devel
 BuildRequires:	perl-base
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
-Requires:	/sbin/chkconfig
+Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		specflags_ia32	 -fomit-frame-pointer 
+%define		skip_post_check_so	dictdplugin_judy.so.*
+
+# plugins dir
+%define		_libexecdir	%{_libdir}/dictd
+
+%define		specflags_ia32	 -fomit-frame-pointer
 
 %description
 Server for the Dictionary Server Protocol (DICT), a TCP transaction
@@ -49,25 +56,25 @@ Package for dictd plugins development.
 Pakiet programistyczny do tworzenia wtyczek dictd.
 
 %package plugin-dbi
-Summary:	DBI plygin for dictd server
+Summary:	DBI plugin for dictd server
 Summary(pl.UTF-8):	Wtyczka DBI dla serwera dictd
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description plugin-dbi
-DBI plygin for dictd server.
+DBI plugin for dictd server.
 
 %description plugin-dbi -l pl.UTF-8
 Wtyczka DBI dla serwera dictd.
 
 %package plugin-judy
-Summary:	Judy plygin for dictd server
+Summary:	Judy plugin for dictd server
 Summary(pl.UTF-8):	Wtyczka Judy dla serwera dictd
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 
 %description plugin-judy
-Judy plygin for dictd server.
+Judy plugin for dictd server.
 
 %description plugin-judy -l pl.UTF-8
 Wtyczka Judy dla serwera dictd.
@@ -130,26 +137,21 @@ dane do pseudo-swobodnego dostępu do pliku.
 %setup -q
 %patch0 -p1
 
-# broken test if >1 plugins
-%{__perl} -pi -e 's/test \$\(PLUGINS\)/test "\$\(PLUGINS\)"/' Makefile.in
-
 %build
 cp -f /usr/share/automake/config.* .
 %{__aclocal}
 %{__autoconf}
-cd libmaa
-cp -f /usr/share/automake/config.* .
-%{__aclocal}
-%{__autoconf}
-cd ..
 CFLAGS="%{rpmcflags} -DUID_NOBODY=99 -DGID_NOBODY=99"
-%configure
+%configure \
+	--with-plugin-dbi \
+	--with-plugin-judy \
+	--with-system-utf8-funcs
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,%{name}},%{_datadir}/%{name}}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_sysconfdir}/%{name},%{_datadir}/%{name}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -163,6 +165,8 @@ install dictd-main.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
+%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/dictdplugin_*.{la,a}
+
 mv -f doc/security.doc security.txt
 
 %clean
@@ -170,23 +174,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f /var/lock/subsys/%{name} ]; then
-	/etc/rc.d/init.d/%{name} restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
-fi
+%service dictd restart
 
 %preun
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/%{name} ]; then
-		/etc/rc.d/init.d/%{name} stop >&2
-	fi
+	%service dictd stop
 	/sbin/chkconfig --del %{name}
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc ANNOUNCE NEWS README* TODO examples/dictd* security.txt
+%doc ANNOUNCE ChangeLog NEWS README TODO examples/dictd* security.txt
 %ghost %{_sysconfdir}/%{name}.conf
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}-main.conf
@@ -194,7 +192,8 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_sbindir}/%{name}
 %dir %{_datadir}/%{name}
-%{_mandir}/man8/%{name}*
+%dir %{_libexecdir}
+%{_mandir}/man8/dictd.8*
 
 %files devel
 %defattr(644,root,root,755)
@@ -203,11 +202,11 @@ fi
 
 %files plugin-dbi
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/dictdplugin_dbi.so
+%attr(755,root,root) %{_libexecdir}/dictdplugin_dbi.so*
 
 %files plugin-judy
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/dictdplugin_judy.so
+%attr(755,root,root) %{_libexecdir}/dictdplugin_judy.so*
 
 %files -n dict
 %defattr(644,root,root,755)
@@ -215,9 +214,11 @@ fi
 %attr(755,root,root) %{_bindir}/colorit
 %attr(755,root,root) %{_bindir}/dict
 %attr(755,root,root) %{_bindir}/dictl
+%attr(755,root,root) %{_bindir}/dict_lookup
 %{_mandir}/man1/colorit.1*
 %{_mandir}/man1/dict.1*
 %{_mandir}/man1/dictl.1*
+%{_mandir}/man1/dict_lookup.1*
 
 %files -n dictfmt
 %defattr(644,root,root,755)