From d09a2a9546f4713b4fae4e33da917360c5f1e570 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Tue, 25 Aug 2009 03:36:31 +0000
Subject: [PATCH] fix spec

---
 yelp-use-pango.patch | 22 ++++++++++++++++++++++
 yelp.spec            |  6 +++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 yelp-use-pango.patch

diff --git a/yelp-use-pango.patch b/yelp-use-pango.patch
new file mode 100644
index 0000000..1acd327
--- /dev/null
+++ b/yelp-use-pango.patch
@@ -0,0 +1,22 @@
+diff -up yelp-2.27.4/src/yelp-main.c.use-pango yelp-2.27.4/src/yelp-main.c
+--- yelp-2.27.4/src/yelp-main.c.use-pango	2009-08-06 20:18:11.000000000 -0400
++++ yelp-2.27.4/src/yelp-main.c	2009-08-24 23:20:45.955969896 -0400
+@@ -412,18 +412,6 @@ main (int argc, char **argv) 
+ #endif /* WITH_SMCLIENT */
+ 
+ 	if (private || !main_is_running ()) {
+-		const gchar          *env;
+-
+-		/* workaround for bug #329461 */
+-		env = g_getenv ("MOZ_ENABLE_PANGO");
+-		
+-		if (env == NULL ||
+-		    *env == '\0' ||
+-		    g_str_equal(env, "0")) 
+-			{
+-				g_setenv ("MOZ_DISABLE_PANGO", "1", TRUE);
+-			}
+-		
+ 		if (session_started) {
+ 			main_restore_session ();
+ 		} else {
diff --git a/yelp.spec b/yelp.spec
index 295affa..5da59b2 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -24,7 +24,7 @@ Source: http://download.gnome.org/sources/yelp/2.27/%{name}-%{version}.tar.bz2
 URL: http://live.gnome.org/Yelp
 Patch1: yelp-2.15.5-fedora-docs.patch
 Patch2: yelp-2.13.2-add-mime-handling.patch
-Patch3: yelp-2.15.91-use-pango.patch
+Patch3: yelp-use-pango.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=497559
 # Patch6: hp.patch
 
@@ -32,7 +32,7 @@ Patch3: yelp-2.15.91-use-pango.patch
 # XXX Does this no longer apply to yelp >= 2.19.1 ?
 #Patch8: yelp-2.18.1-posix-man.patch
 
-Patch12: libxul.patch
+# Patch12: libxul.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=592762
 Patch13: ellipsis.patch
@@ -88,7 +88,7 @@ documentation written in DocBook.
 %patch2 -p1 -b .add-mime-handling
 %patch3 -p1 -b .use-pango
 #%patch6 -p1 -b .hp
-%patch12 -p1 -b .libxul
+#%patch12 -p1 -b .libxul
 %patch13 -p1 -b .ellipsis
 
 # force regeneration