From 4ecd3cede70bb7fc9dbabbd274e176879e327948 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Jul 04 2011 11:54:10 +0000
Subject: update to version 1.12.0

split into server and client packages

---

diff --git a/.gitignore b/.gitignore
index 666004c..219feba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 dictd-1.11.0.tar.gz
 libmaa-1.1.0.tar.gz
+/libmaa-1.3.0.tar.gz
+/dictd-1.12.0.tar.gz
diff --git a/dictd-1.12.0-unusedvar.patch b/dictd-1.12.0-unusedvar.patch
new file mode 100644
index 0000000..ab92b1c
--- /dev/null
+++ b/dictd-1.12.0-unusedvar.patch
@@ -0,0 +1,33 @@
+diff -up dictd-1.12.0/libmaa/pr.c.unusedvar dictd-1.12.0/libmaa/pr.c
+--- dictd-1.12.0/libmaa/pr.c.unusedvar	2011-07-04 13:40:12.130732584 +0200
++++ dictd-1.12.0/libmaa/pr.c	2011-07-04 13:40:33.479732586 +0200
+@@ -386,7 +386,7 @@ int pr_filter( const char *command,
+ 	       const char *inBuffer, int inLen,
+ 	       char *outBuffer, int outMaxLen )
+ {
+-   int  pid;
++    __attribute__((__unused__)) int  pid;
+    int  in, out;
+    
+    pid = pr_open( command, PR_CREATE_STDIN | PR_CREATE_STDOUT,
+diff -up dictd-1.12.0/libmaa/string.c.unusedvar dictd-1.12.0/libmaa/string.c
+--- dictd-1.12.0/libmaa/string.c.unusedvar	2008-12-07 15:58:11.000000000 +0100
++++ dictd-1.12.0/libmaa/string.c	2011-07-04 13:39:40.787732580 +0200
+@@ -111,7 +111,7 @@ int str_pool_iterate(
+    hsh_HashTable hash = p -> hash;
+    hsh_Position  hash_pos;
+    void *key;
+-   void *datum;
++   __attribute__((__unused__)) void *datum;
+ 
+ /*   printf ("inside str_pool_iterate\n"); */
+ 
+@@ -140,7 +140,7 @@ int str_pool_iterate_arg(
+    hsh_HashTable hash = p -> hash;
+    hsh_Position  hash_pos;
+    void *key;
+-   void *datum;
++   __attribute__((__unused__)) void *datum;
+ 
+    HSH_ITERATE (hash, hash_pos, key, datum){
+       if ((*iterator) (key, arg)){
diff --git a/dictd.spec b/dictd.spec
index 0dda9c6..dd18386 100644
--- a/dictd.spec
+++ b/dictd.spec
@@ -1,13 +1,14 @@
-%define libmaaVersion 1.1.0
-Summary:   DICT protocol (RFC 2229) command-line client
+%define libmaaVersion 1.3.0
+Summary:   DICT protocol (RFC 2229) server and command-line client
 Name:      dictd
-Version:   1.11.0
-Release:   6%{?dist}
+Version:   1.12.0
+Release:   1%{?dist}
 License:   GPL+ and zlib and MIT
 Group:     Applications/Internet
 Source0:   http://downloads.sourceforge.net/dict/%{name}-%{version}.tar.gz
 Source1:   dictd.init
 Source2:   libmaa-%{libmaaVersion}.tar.gz
+Patch0:    dictd-1.12.0-unusedvar.patch
 URL:       http://www.dict.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post):  chkconfig
@@ -22,14 +23,30 @@ Protocol (DICT) is a TCP transaction based query/response protocol that
 allows a client to access dictionary definitions from a set of natural
 language dictionary databases.
 
+%package server
+Summary: Server for the Dictionary Server Protocol (DICT)
+Group: System Environment/Daemons
+%description server
+A server for the DICT protocol. You need to install dictd-usable databases
+befor you can use this server. Those can be found p.e. at 
+ftp://ftp.dict.org/pub/dict/pre/
+More information can be found in the INSTALL file in this package.
+
 %prep
 %setup -q
 tar xzf %{SOURCE2}
 mv libmaa-%{libmaaVersion} libmaa
+%patch0 -p1 -b .unusedvar
 
 %build
-%configure --with-cflags="$RPM_OPT_FLAGS" --enable-dictorg --disable-plugin \
-            --with-local-libmaa
+pushd libmaa
+./configure
+make
+popd
+
+export CFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS='-Llibmaa/.libs' CPPFLAGS='-Ilibmaa'
+%configure --enable-dictorg --disable-plugin
 make %{?_smp_mflags}
 
 %install
@@ -61,12 +78,20 @@ fi
 %defattr(-,root,root,-)
 %doc ANNOUNCE COPYING ChangeLog README doc/rfc2229.txt doc/security.doc
 %{_bindir}/*
-%{_sbindir}/*
 %{_mandir}/man?/*
 %{_sysconfdir}/rc.d/init.d/*
 %config(noreplace) %{_sysconfdir}/sysconfig/dictd
 
+%files server
+%doc ANNOUNCE COPYING INSTALL ChangeLog README doc/rfc2229.txt doc/security.doc
+%{_sbindir}/*
+%{_sysconfdir}/rc.d/init.d/*
+
 %changelog
+* Mon Jul 04 2011 Karsten Hopp <karsten@redhat.com> 1.12.0-1
+- update to version 1.12.0
+- split into server and client packages
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index b8711d2..7849c0d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-1b316bf797ff239eb87110c18cd7d5d9  dictd-1.11.0.tar.gz
-d1883d09f65179a3b6aa16579cb5a7e9  libmaa-1.1.0.tar.gz
+ea87fda8987f3b12bee6963a7aacc279  libmaa-1.3.0.tar.gz
+71aaf3a697ea2e9409643f11ea85b53a  dictd-1.12.0.tar.gz