add patch gtkhtml-02-fix-label.diff, fixes iso codes check. opensolaris-2009-06 OSOL0906_SRU4_02
authorsaps
Mon, 17 Aug 2009 06:05:32 +0000
branchopensolaris-2009-06
changeset 14330 5a9531d6fa88
parent 14329 9c2f7add363b
child 14331 bb1c48cd7ee8
add patch gtkhtml-02-fix-label.diff, fixes iso codes check. Fix for CR 6821920
base-specs/gtkhtml.spec
patches/gtkhtml-02-fix-label.diff
--- a/base-specs/gtkhtml.spec	Fri Aug 14 15:35:10 2009 +0000
+++ b/base-specs/gtkhtml.spec	Mon Aug 17 06:05:32 2009 +0000
@@ -21,6 +21,9 @@
 Source1:      l10n-configure.sh
 # date:2009-01-12 owner:fujiwara type:bug bugster:6789550 bugzilla:567130 state:upstream
 Patch1:       gtkhtml-01-g11n-i18n-ui.diff
+# date:2009-08-17 owner:partha type:bug bugster:6821920 state:upstream
+Patch2:       gtkhtml-02-fix-label.diff
+
 
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -63,6 +66,7 @@
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 libtoolize --force
@@ -115,6 +119,8 @@
 %{_includedir}/libgtkhtml-%{major_version}/*
 
 %changelog
+* Mon Aug 17 2009 - [email protected]
+- add patch gtkhtml-02-fix-label.diff, fixes iso codes check
 * Mon Jan 12 2009 - [email protected]
 - Add patch g11n-i18n-ui.diff to fix message i18n.
 * Tue Nov 25 2008 - [email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gtkhtml-02-fix-label.diff	Mon Aug 17 06:05:32 2009 +0000
@@ -0,0 +1,13 @@
+--- gtkhtml-3.26.0/configure.in.orig	Tue Apr  7 17:54:48 2009
++++ gtkhtml-3.26.0/configure.in	Tue Apr  7 17:55:22 2009
+@@ -154,8 +154,8 @@
+ 
+ if test "x$have_iso_codes" = "xyes"; then
+ 	AC_MSG_CHECKING([whether iso-codes has iso-639 and iso-3166 domains])
+-	if $PKG_CONFIG --variable=domains iso-codes | grep -q 639 && \
+-		$PKG_CONFIG --variable=domains iso-codes | grep -q 3166 ; then
++	if $PKG_CONFIG --variable=domains iso-codes | grep 639 && \
++		$PKG_CONFIG --variable=domains iso-codes | grep 3166 ; then
+ 			result=yes
+ 	else
+ 		result=no