From 139ec46f34f31ba4fbd35cf18776b4e37f033e75 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Sun, 17 Jun 2007 19:52:11 +0000
Subject: [PATCH] 2.19.4

---
 .cvsignore                           |  2 +-
 gnome-menus-pythread-bgo442747.patch | 38 ----------------------------
 gnome-menus.spec                     | 10 +++++---
 sources                              |  2 +-
 4 files changed, 8 insertions(+), 44 deletions(-)
 delete mode 100644 gnome-menus-pythread-bgo442747.patch

diff --git a/.cvsignore b/.cvsignore
index 718ac4f..2b26881 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-menus-2.19.3.tar.bz2
+gnome-menus-2.19.4.tar.bz2
diff --git a/gnome-menus-pythread-bgo442747.patch b/gnome-menus-pythread-bgo442747.patch
deleted file mode 100644
index a6c7678..0000000
--- a/gnome-menus-pythread-bgo442747.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- gnome-menus-2.18.0/python/gmenu.c~	2007-03-12 14:49:27.000000000 -0400
-+++ gnome-menus-2.18.0/python/gmenu.c	2007-06-05 19:55:37.000000000 -0400
-@@ -1497,6 +1497,9 @@
- {
-   PyObject *args;
-   PyObject *ret;
-+  PyGILState_STATE gstate;
-+
-+  gstate = PyGILState_Ensure();
- 
-   args = PyTuple_New (callback->user_data ? 2 : 1);
- 
-@@ -1513,6 +1516,8 @@
- 
-   Py_XDECREF (ret);
-   Py_DECREF (args);
-+
-+  PyGILState_Release(gstate);
- }
- 
- static PyObject *
-@@ -1522,10 +1527,15 @@
-   PyGMenuTree         *tree;
-   PyGMenuTreeCallback *callback;
-   PyObject            *pycallback;
--  PyObject            *pyuser_data;
-+  PyObject            *pyuser_data = NULL;
- 
-   if (!PyArg_ParseTuple (args, "O|O:gmenu.Tree.add_monitor", &pycallback, &pyuser_data))
-     return NULL;
-+  if (!PyCallable_Check(pycallback))
-+    {
-+      PyErr_SetString(PyExc_TypeError, "callback must be callable");
-+      return NULL;
-+    }
- 
-   tree = (PyGMenuTree *) self;
- 
diff --git a/gnome-menus.spec b/gnome-menus.spec
index 9d3d686..33c90ab 100644
--- a/gnome-menus.spec
+++ b/gnome-menus.spec
@@ -5,13 +5,12 @@
 
 Summary:  A menu system for the GNOME project
 Name: gnome-menus
-Version: 2.19.3
-Release: 2%{?dist}
+Version: 2.19.4
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnome.org/
 Source0: http://download.gnome.org/sources/gnome-menus/2.19/%{name}-%{version}.tar.bz2
-Patch0: gnome-menus-pythread-bgo442747.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:  redhat-menus >= 7.8.9-2
 BuildRequires: glib2-devel >= 2.6.0
@@ -43,7 +42,6 @@ writing applications that use the GNOME menu system.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
@@ -100,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/gnome-menus
 
 %changelog
+* Sun Jun 17 2007 Matthias Clasen <mclasen@redhat.com> - 2.19.4-1 
+- Update to 2.19.4
+- Drop upstreamed patch
+
 * Thu Jun 14 2007 Colin Walters <walters@redhat.com> - 2.19.3-2
 - Add patch gnome-menus-pythread-bgo442747.patch
 
diff --git a/sources b/sources
index 9143b87..019cc32 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb56b15fecd4b22ba749b68914eabb19  gnome-menus-2.19.3.tar.bz2
+1db7d868a1c7d4b9085ba14a9dc4172a  gnome-menus-2.19.4.tar.bz2