- fix improper usage of %%{_sysconfdir}

[packages/dictd.git] / dictd.spec

diff --git a/dictd.spec b/dictd.spec
index 73ae85f0aab2987f4a71e7204b798df47cf6c2a1..1172989186eafe599bff87e3f3cb51116e40c5ac 100644 (file)
--- a/dictd.spec
+++ b/dictd.spec
@@ -1,28 +1,28 @@
 Summary:       Dictionary database server
 Summary(pl):   Serwer bazy s³owników
 Name:          dictd
-Version:       1.5.5
-Release:       5
+Version:       1.8.0
+Release:       3
 License:       GPL
-Group:         Daemons
-Group(de):     Server
-Group(pl):     Serwery
+Group:         Networking/Daemons
 Source0:       ftp://ftp.dict.org/pub/dict/%{name}-%{version}.tar.gz
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Patch0:                %{name}-no_libnsl.patch
-Patch1:                %{name}-system-zlib.patch
-Patch2:                %{name}-opt.patch
+Patch1:                %{name}-opt.patch
+Patch2:                %{name}-smp.patch
+Patch3:                %{name}-ac253.patch
 URL:           http://www.dict.org/
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: flex
 BuildRequires: bison
+BuildRequires: flex
+BuildRequires: libltdl-devel
 BuildRequires: zlib-devel
-Prereq:                /sbin/chkconfig
+PreReq:                /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%description 
+%description
 Server for the Dictionary Server Protocol (DICT), a TCP transaction
 based query/response protocol that allows a client to access
 dictionary definitions from a set of natural language dictionary
@@ -37,8 +37,6 @@ definicji s
 Summary:       DICT Protocol Client
 Summary(pl):   Klient protoko³u DICT
 Group:         Applications/Networking
-Group(de):     Applikationen/Netzwerkwesen
-Group(pl):     Aplikacje/Sieciowe
 
 %description -n dict
 Client for the Dictionary Server Protocol (DICT), a TCP transaction
@@ -54,8 +52,6 @@ definicji s
 Summary:       Compress (or expand) files, allowing random access
 Summary(pl):   Kompresja (i dekompresja) plików pozwalaj±ca na swobodny dostêp
 Group:         Applications/Archiving
-Group(de):     Applikationen/Archivierung
-Group(pl):     Aplikacje/Archiwizacja
 
 %description -n dictzip
 dictzip compresses files using the gzip(1) algorithm (LZ77) in a
@@ -78,11 +74,17 @@ dane do pseudo-swobodnego dost
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
-aclocal
-autoconf
-(cd libmaa; aclocal; autoconf)
+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
 
@@ -91,7 +93,7 @@ CFLAGS="%{rpmcflags} -DUID_NOBODY=99 -DGID_NOBODY=99"
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,%{name}},%{_bindir},%{_sbindir}} \
-          $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_mandir}/man{1,8}}
+               $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_mandir}/man{1,8}}
 
 install dict dictzip $RPM_BUILD_ROOT%{_bindir}
 install {dict,dictzip}.1 $RPM_BUILD_ROOT%{_mandir}/man1
@@ -100,7 +102,7 @@ install %{name} $RPM_BUILD_ROOT%{_sbindir}
 install %{name}.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
 echo "server localhost" > dict.conf
-echo -e "access {\n\tallow localhost\n\tdeny *\n}\n" > %{name}-main.conf 
+echo -e "access {\n\tallow localhost\n\tdeny *\n}\n" > %{name}-main.conf
 
 install dict.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install dictd-main.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
@@ -109,7 +111,6 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
 mv -f doc/security.doc security.txt
-gzip -9nf {ANNOUNCE,ChangeLog,README,TODO,%{name}.conf,example*.conf,example.site,security.txt}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -117,11 +118,11 @@ 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
+       /etc/rc.d/init.d/%{name} restart >&2
 else
-        echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
+       echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
 fi
-    
+
 %preun
 if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/%{name} ]; then
@@ -132,19 +133,19 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc ANNOUNCE ChangeLog README* TODO dictd.conf example* security.txt
 %ghost %{_sysconfdir}/%{name}.conf
-%attr(755,root,root) %{_sbindir}/%{name}
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/%{name}/%{name}-main.conf
+%config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/%{name}
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/sysconfig/%{name}
+%attr(755,root,root) %{_sbindir}/%{name}
 %dir %{_datadir}/%{name}
-%dir %{_sysconfdir}/%{name}
-%{_sysconfdir}/%{name}/%{name}-main.conf
 %{_mandir}/man8/%{name}*
 
 %files -n dict
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/dict.conf
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/dict.conf
 %attr(755,root,root) %{_bindir}/dict
 %{_mandir}/man1/dict.1*