rpms/stardict/devel stardict-3.0.1-10.gucharmap.patch, NONE, 1.1 stardict.spec, 1.51, 1.52

[Caius Chance (cchance)]

Author: cchance

Update of /cvs/pkgs/rpms/stardict/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4870

Modified Files:
	stardict.spec 
Added Files:
	stardict-3.0.1-10.gucharmap.patch 
Log Message:
* Thu Jul 10 2008 Caius Chance <cchance at redhat.com> - 3.0.1-10.fc10
- Rebuilt for gucharmap updation 2.22.1 and pkgconfig .ac name change.



stardict-3.0.1-10.gucharmap.patch:

--- NEW FILE stardict-3.0.1-10.gucharmap.patch ---
diff -up stardict-3.0.1/configure.in.testing stardict-3.0.1/configure.in
--- stardict-3.0.1/configure.in.testing	2007-11-01 03:37:15.000000000 -0400
+++ stardict-3.0.1/configure.in	2008-07-10 13:30:19.000000000 -0400
@@ -76,7 +76,7 @@ AC_ARG_ENABLE([gucharmap],
 	[enable_gucharmap=yes])
 
 if test "x$enable_gucharmap" = "xyes" ; then
-	PKG_CHECK_MODULES(GUCHARMAP, [gucharmap >= 1.4.0], have_gucharmap=yes, have_gucharmap=no)
+	PKG_CHECK_MODULES(GUCHARMAP, [gucharmap-2 >= 2.22.1], have_gucharmap=yes, have_gucharmap=no)
 	if test "x$have_gucharmap" = "xyes"; then
 		GUCHARMAP_CFLAGS="${GUCHARMAP_CFLAGS}"
 		GUCHARMAP_LIBS="${GUCHARMAP_LIBS}"
@@ -393,11 +393,11 @@ STARDICT_CFLAGS="$SIGCPP_CFLAGS $STARDIC
 STARDICT_LIBS="$SIGCPP_LIBS $STARDICT_LIBS"
 else
 echo "Use local libsigc++20";
-SIGC_CXX_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD()
-SIGC_CXX_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD()
-SIGC_CXX_SELF_REFERENCE_IN_MEMBER_INITIALIZATION()
-SIGC_CXX_HAS_NAMESPACE_STD()
-SIGC_CXX_HAS_SUN_REVERSE_ITERATOR()
+#SIGC_CXX_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD()
+#SIGC_CXX_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD()
+#SIGC_CXX_SELF_REFERENCE_IN_MEMBER_INITIALIZATION()
+#SIGC_CXX_HAS_NAMESPACE_STD()
+#SIGC_CXX_HAS_SUN_REVERSE_ITERATOR()
 
 if test "X$config_error" = "Xyes" ; then
   AC_ERROR(
diff -up stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp.testing stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp
--- stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp.testing	2008-07-11 06:34:02.000000000 -0400
+++ stardict-3.0.1/stardict-plugins/stardict-gucharmap-plugin/stardict_gucharmap.cpp	2008-07-11 06:34:29.000000000 -0400
@@ -238,7 +238,7 @@ static void lookup(const char *text, cha
 	/* canonical decomposition */
 	gunichar *decomposition;
 	gsize result_len;
-	decomposition = gucharmap_unicode_canonical_decomposition (uc, &result_len);
+	decomposition = g_unicode_canonical_decomposition (uc, &result_len);
 	if (result_len != 1) {
 		definition += _("Canonical decomposition:");
 		definition += " ";


Index: stardict.spec
===================================================================
RCS file: /cvs/pkgs/rpms/stardict/devel/stardict.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- stardict.spec	29 Jun 2008 23:18:39 -0000	1.51
+++ stardict.spec	11 Jul 2008 02:44:40 -0000	1.52
@@ -5,13 +5,14 @@
 Name:		%{name}
 Summary: 	A powerful dictionary platform written in GTK+2
 Version:	%{version}
-Release:	9%{?dist}
+Release:	10%{?dist}
 Group: 		Applications/System
 License: 	GPLv3
 URL: 		http://stardict.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Patch0:		stardict-3.0.1.gcc43.patch
 Patch1:		transparent_trayicon.patch
+Patch2:		stardict-3.0.1-10.gucharmap.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: libgnome >= 2.2.0
@@ -42,8 +43,9 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
-%patch1 -p1 -b .trayicon
+%patch0 -p1 -b .1-gcc43
+%patch1 -p1 -b .2-trayicon
+%patch2 -p1 -b .3-gucharmap
 
 # Remove unneeded sigc++ header files to make it sure
 # that we are using system-wide libsigc++
@@ -52,6 +54,8 @@
 find src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f
 
 %build
+%{__aclocal}
+%{__autoconf}
 %configure --disable-schemas-install --disable-festival
 make
 
@@ -94,8 +98,11 @@
 if which scrollkeeper-update>/dev/null 2>&1; then scrollkeeper-update; fi
 
 %changelog
+* Thu Jul 10 2008 Caius Chance <cchance at redhat.com> - 3.0.1-10.fc10
+- Rebuilt for gucharmap updation 2.22.1 and pkgconfig .ac name change.
+
 * Mon Jun 30 2008 Caius Chance <cchance at redhat.com> - 3.0.1-9.fc10
-- Fixed broken dependencies with guchapmap.
+- Fixed broken dependencies with gucharmap.
 
 * Fri Feb 29 2008 Hu Zheng <zhu at redhat.com> - 3.0.1-8
 - Forget commit first.