[stardict] Fixed Bz #641955: remove gucharmap dependency as gucharmap use gtk3, but stardict still use gtk2.

[Ding-Yi Chen]

commit 0a290faf8d0f471ff1f167729a14ff5c17b9463a
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Thu Oct 14 20:47:32 2010 +1000

    Fixed Bz #641955: remove gucharmap dependency as
    gucharmap use gtk3, but stardict still use gtk2.

 .gitignore      |    1 +
 defaultdict.cfg |    5 +++++
 sources         |    1 -
 stardict.spec   |   48 ++++++++++++++++++++++++++++--------------------
 4 files changed, 34 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8827708..918e74c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 stardict-3.0.1.tar.bz2
 defaultdict.cfg
+/stardict-3.0.1.tar.bz2
diff --git a/defaultdict.cfg b/defaultdict.cfg
new file mode 100644
index 0000000..56b6180
--- /dev/null
+++ b/defaultdict.cfg
@@ -0,0 +1,5 @@
+[dict]
+default=
+default[en_US.utf8]=
+default[zh_TW.utf8]=oxford-big5.ifo;cedict-big5.ifo
+default[zh_CN.utf8]=
diff --git a/sources b/sources
index 49d5405..1172992 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 93bb2d7825bc9d52a4f9ba4c1c506d1d  stardict-3.0.1.tar.bz2
-2ff105238b1bdf8f9b79b6d380970fc0  defaultdict.cfg
diff --git a/stardict.spec b/stardict.spec
index 7bbfa2b..f8e9223 100644
--- a/stardict.spec
+++ b/stardict.spec
@@ -1,22 +1,22 @@
-%define name	stardict
+%define name    stardict
 %define version 3.0.1
 
 Name:		%{name}
-Summary: 	A powerful dictionary platform written in GTK+2
-Version:	%{version}
-Release:	21%{?dist}
-Group: 		Applications/System
-License: 	GPLv3
-URL: 		http://stardict.sourceforge.net
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
-Source1:	defaultdict.cfg
-Patch0:		stardict-3.0.1.gcc43.patch
-Patch1:		transparent_trayicon.patch
-Patch2:		stardict-3.0.1-10.gucharmap.patch
-Patch3:		stardict-3.0.1-13.bz441209.patch
-Patch4:		stardict-3.0.1.gcc44.patch
+Summary:        A powerful dictionary platform written in GTK+2
+Version:        %{version}
+Release:        22%{?dist}
+Group:          Applications/System
+License:        GPLv3
+URL:            http://stardict.sourceforge.net
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
+Source1:        defaultdict.cfg
+Patch0:         stardict-3.0.1.gcc43.patch
+Patch1:         transparent_trayicon.patch
+Patch2:         stardict-3.0.1-10.gucharmap.patch
+Patch3:         stardict-3.0.1-13.bz441209.patch
+Patch4:         stardict-3.0.1.gcc44.patch
 Patch5:         stardict-3.0.1-20.security.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: enchant, espeak, gucharmap >= 2.22.1, libbonobo >= 2.2.0, libgnome >= 2.2.0, libgnomeui >= 2.2.0, libsigc++20 >= 2.0.17
 #Requires: festival, speech-tools
@@ -25,7 +25,12 @@ Requires(post): GConf2, scrollkeeper
 Requires(postun): scrollkeeper
 
 BuildRequires: autoconf, automake, libtool
-BuildRequires: desktop-file-utils, enchant-devel, gettext, gucharmap-devel >= 2.22.1, intltool, libgnomeui-devel >= 2.2.0, libsigc++20-devel, libtool, perl-XML-Parser, scrollkeeper
+BuildRequires: desktop-file-utils, enchant-devel, gettext,  intltool, libgnomeui-devel >= 2.2.0, libsigc++20-devel, libtool, perl-XML-Parser, scrollkeeper
+
+#Bz #641955: remove gucharmap dependency as gucharmap use gtk3, but stardict still use gtk2.
+%if 0%{?fedora} <=13
+BuildRequires: gucharmap-devel >= 2.22.1
+%endif
 #BuildRequires: festival-devel, speech-tools-devel, espeak-devel
 
 %description
@@ -53,7 +58,7 @@ find src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f
 %{__aclocal}
 %{__autoconf}
 %{__libtoolize}
-%configure --disable-schemas-install --disable-festival --disable-espeak
+%configure --disable-schemas-install --disable-festival --disable-espeak --disable-gucharmap
 make -k %{_smp_mflags}
 
 %install
@@ -85,9 +90,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/idl/*
 %{_libdir}/bonobo/servers/*.server
 %{_datadir}/pixmaps/stardict.png
-%{_sysconfdir}/gconf/schemas/*.schemas
-%dir %{_sysconfdir}/%{name}
-%{_sysconfdir}/%{name}/defaultdict.cfg
+%config(noreplace) %{_sysconfdir}/gconf/schemas/*.schemas
+%config(noreplace) %dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/defaultdict.cfg
 %{_datadir}/omf/*
 %{_mandir}/man1/*
 %doc %{_datadir}/gnome/help/stardict
@@ -107,6 +112,9 @@ if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Thu Oct 14 2010 Ding-Yi Chen <dchen at redhat.com> - 3.0.1-22
+- Fixed Bz #641955: remove gucharmap dependency as gucharmap use gtk3, but stardict still use gtk2.
+
 * Sun Dec 27 2009 Caius 'kaio' Chance <k at kaio.me> - 3.0.1-21
 - rebuilt