diff --git a/.cvsignore b/.cvsignore index 55c6bd7..6fec484 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -devhelp-0.23.tar.bz2 +devhelp-0.23.1.tar.bz2 diff --git a/devhelp-0.23-deprecation-workaround.patch b/devhelp-0.23-deprecation-workaround.patch deleted file mode 100644 index 6eae12a..0000000 --- a/devhelp-0.23-deprecation-workaround.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up devhelp-0.23/src/dh-assistant-view.c.deprecation-workaround devhelp-0.23/src/dh-assistant-view.c ---- devhelp-0.23/src/dh-assistant-view.c.deprecation-workaround 2008-11-28 10:56:04.000000000 -0500 -+++ devhelp-0.23/src/dh-assistant-view.c 2009-07-15 09:47:19.000000000 -0400 -@@ -340,7 +340,11 @@ assistant_view_set_link (DhAssistantView - webkit_web_view_open (WEBKIT_WEB_VIEW (view), "about:blank"); - } - -+#if GLIB_CHECK_VERSION(2,21,3) -+ g_mapped_file_unref (file); -+#else - g_mapped_file_free (file); -+#endif - g_free (filename); - } - diff --git a/devhelp.spec b/devhelp.spec index d1a719b..f0e6aaf 100644 --- a/devhelp.spec +++ b/devhelp.spec @@ -5,8 +5,8 @@ ### Abstract ### Name: devhelp -Version: 0.23 -Release: 9%{?dist} +Version: 0.23.1 +Release: 1%{?dist} License: GPLv2+ Group: Development/Tools Summary: API documention browser @@ -19,9 +19,6 @@ BuildRoot: %{_tmppath}/devhelp-%{version}-%{release}-root-%(%{__id_u} -n) # RH bug #572022 Patch0: devhelp-load-uris.patch -# GNOME bug #588655 -Patch1: devhelp-0.23-deprecation-workaround.patch - ### Dependencies ### Requires(pre): GConf2 >= 2.14 @@ -59,7 +56,6 @@ into other applications such as IDEs. %prep %setup -q -n devhelp-%{version} %patch0 -p0 -b .uris -%patch1 -p1 -b .deprecation-workaround # force regeneration rm data/devhelp.schemas @@ -146,6 +142,10 @@ fi %{_libdir}/pkgconfig/* %changelog +* Wed Aug 12 2009 Matthew Barnes - 0.23.1-1 +- Update to 0.23.1 +- Remove patch for GNOME bug #588655 (fixed upstream). + * Fri Jul 24 2009 Fedora Release Engineering - 0.23-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 9d3f832..997fe90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -704c0c90616aeb1c52ca3af1df93fde6 devhelp-0.23.tar.bz2 +9bb80a1e82eb0de57cdd7f4234880b2f devhelp-0.23.1.tar.bz2