[stardict] Apply the configure patch inside dict and lib directory

[paragn]

commit 9fe5a350b3312e61a127aacc67854746d8d51328
Author: Parag Nemade <pnemade at redhat.com>
Date:   Wed Jan 16 19:58:30 2013 +0530

    Apply the configure patch inside dict and lib directory

 stardict-3.0.4-configure.patch |   48 ++++++++++++++++++++++++++++++++++++++++
 stardict.spec                  |   17 ++++++++++---
 2 files changed, 61 insertions(+), 4 deletions(-)
---
diff --git a/stardict-3.0.4-configure.patch b/stardict-3.0.4-configure.patch
new file mode 100644
index 0000000..e007dd6
--- /dev/null
+++ b/stardict-3.0.4-configure.patch
@@ -0,0 +1,48 @@
+diff --git a/autogen.sh b/autogen.sh
+index 3996995..73607df 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -49,4 +49,3 @@ cd "$topdir"
+ ${srcdir}/lib/autogen.sh
+ ${srcdir}/dict/autogen.sh
+ ${srcdir}/tools/autogen.sh
+-"${srcdir}/configure" --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --disable-deprecations --disable-gucharmap --disable-dictdotcn --disable-festival "$@"
+diff --git a/dict/configure.ac b/dict/configure.ac
+index fc1a3af..97b8073 100644
+--- a/dict/configure.ac
++++ b/dict/configure.ac
+@@ -286,7 +286,7 @@ elif test "x${enable_maemo_support}" = "xyes" ; then
+ elif test "x${enable_darwin_support}" = "xyes" ; then
+   DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.16 gthread-2.0"
+ elif test "x${enable_gnome_support}" = "xno" ; then
+-  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.16 gthread-2.0"
++  DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.16 gmodule-2.0 gthread-2.0"
+ else
+   DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.16 gthread-2.0 libgnome-2.0 libbonobo-2.0 gconf-2.0"
+ fi
+diff --git a/lib/configure.ac b/lib/configure.ac
+index c42e00d..bab5765 100644
+--- a/lib/configure.ac
++++ b/lib/configure.ac
+@@ -26,7 +26,7 @@ AC_CHECK_HEADERS([stdlib.h])
+ # Checks for typedefs, structures, and compiler characteristics.
+ 
+ # Checks for library functions.
+-DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.8 zlib libxml-2.0 >= 2.5"
++DEP_MODULES="gtk+-2.0 glib-2.0 >= 2.8 gmodule-2.0 zlib libxml-2.0 >= 2.5"
+ PKG_CHECK_MODULES(STARDICT, $DEP_MODULES)
+ 
+ AC_ARG_ENABLE([deprecations],
+diff --git a/lib/src/libcommon.h b/lib/src/libcommon.h
+index 10f13b4..bc642bd 100644
+--- a/lib/src/libcommon.h
++++ b/lib/src/libcommon.h
+@@ -188,7 +188,7 @@ namespace clib {
+ }
+ 
+ namespace zip {
+-typedef ResourceWrapper<void, void*, int, gzclose> gzFile;
++typedef ResourceWrapper<gzFile_s, gzFile, int, gzclose> gzFile;
+ }
+ 
+ /* Create a new temporary file. Return file name in file name encoding.
diff --git a/stardict.spec b/stardict.spec
index f14a2e6..85a29d1 100644
--- a/stardict.spec
+++ b/stardict.spec
@@ -1,7 +1,7 @@
 Name:		stardict
 Summary:        A powerful dictionary platform written in GTK+2
 Version:        3.0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          Applications/System
 License:        GPLv3
 URL:            http://code.google.com/p/stardict-3/
@@ -46,7 +46,13 @@ find dict/src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f
 chmod 644 COPYING
 
 %build
-autoreconf
+pushd dict
+autoreconf -i -f
+popd
+pushd lib
+autoreconf -i -f
+popd
+
 %configure --disable-schemas-install --disable-festival --disable-espeak --disable-gucharmap
 make -k %{_smp_mflags}
 
@@ -94,6 +100,9 @@ rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 
 
 %changelog
+* Wed Jan 16 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 3.0.4-2
+- Apply the configure patch inside dict and lib directory
+
 * Wed Jan 16 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 3.0.4-1
 - update to 3.0.4
 - thanks to Robin Lee for configure patch
@@ -212,11 +221,11 @@ rm -f `find $RPM_BUILD_ROOT%{_libdir}/stardict/plugins -name "*.la"`
 * Fri Jun 22 2007 Hu Zheng <zhu at redhat.com> - 2.4.8-3
 - Add dic and treedict directory.
 
-* Thu Jan 16 2007 Mayank Jain <majain at redhat.com>
+* Tue Jan 16 2007 Mayank Jain <majain at redhat.com>
 - Removed gnome support from the spec file (--disable-gnome-support) for bug 213850
 - Commented the gnome related directives.
 
-* Thu Jan 12 2007 Mayank Jain <majain at redhat.com>
+* Fri Jan 12 2007 Mayank Jain <majain at redhat.com>
 - Added perl-XML-Parser as BuildRequires
 
 * Thu Jan 11 2007 Mayank Jain <majain at redhat.com>