From c448447729504b134abf4aef0a93b94b8997da9e Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Fri, 21 Aug 2009 18:37:01 +0000
Subject: [PATCH] - Remove patch for GNOME bug #572022 to help fix RH bug
 #518481.

---
 devhelp-load-uris.patch | 33 ---------------------------------
 devhelp.spec            | 11 ++++-------
 2 files changed, 4 insertions(+), 40 deletions(-)
 delete mode 100644 devhelp-load-uris.patch

diff --git a/devhelp-load-uris.patch b/devhelp-load-uris.patch
deleted file mode 100644
index f0e5d60..0000000
--- a/devhelp-load-uris.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: src/dh-parser.c
-===================================================================
---- src/dh-parser.c	(revision 1263)
-+++ src/dh-parser.c	(working copy)
-@@ -66,6 +66,7 @@
- {
-         gint         i;
-         gint         line, col;
-+        gchar       *tmp_base;
-         const gchar *title = NULL;
-         const gchar *base = NULL;
-         const gchar *name = NULL;
-@@ -126,11 +127,18 @@
-         }
- 
-         if (base) {
--                parser->base = g_strdup (base);
-+                tmp_base = g_strdup (base);
-         } else {
--                parser->base = g_path_get_dirname (parser->path);
-+                tmp_base = g_path_get_dirname (parser->path);
-         }
-+        parser->base = g_filename_to_uri (tmp_base, NULL, NULL);
- 
-+        /* In case the conversion didn't work */
-+        if (parser->base)
-+        	g_free (tmp_base);
-+	else
-+		parser->base = tmp_base;
-+
-         link = dh_link_new (DH_LINK_TYPE_BOOK,
-                             parser->base,
-                             name,
diff --git a/devhelp.spec b/devhelp.spec
index f0e6aaf..1604f3e 100644
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -6,7 +6,7 @@
 
 Name: devhelp
 Version: 0.23.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Summary: API documention browser
@@ -14,11 +14,6 @@ URL: http://developer.imendio.com/projects/devhelp
 Source: http://download.gnome.org/sources/devhelp/0.23/devhelp-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root-%(%{__id_u} -n)
 
-### Patches ###
-
-# RH bug #572022
-Patch0: devhelp-load-uris.patch
-
 ### Dependencies ###
 
 Requires(pre): GConf2 >= 2.14
@@ -55,7 +50,6 @@ into other applications such as IDEs.
 
 %prep
 %setup -q -n devhelp-%{version}
-%patch0 -p0 -b .uris
 
 # force regeneration
 rm data/devhelp.schemas
@@ -142,6 +136,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Aug 21 2009 Matthew Barnes <mbarnes@redhat.com> - 0.23.1-2
+- Remove patch for GNOME bug #572022 to help fix RH bug #518481.
+
 * Wed Aug 12 2009 Matthew Barnes <mbarnes@redhat.com> - 0.23.1-1
 - Update to 0.23.1
 - Remove patch for GNOME bug #588655 (fixed upstream).