diff --git a/emacs-gtk.patch b/emacs-gtk.patch deleted file mode 100644 index 041df1b..0000000 --- a/emacs-gtk.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- emacs-23.1/configure.in.orig 2009-08-31 00:18:44.000000000 +0100 -+++ emacs-23.1/configure.in 2009-08-31 00:18:47.000000000 +0100 -@@ -1514,7 +1514,7 @@ - HAVE_GTK=no - if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then - GLIB_REQUIRED=2.6 -- GTK_REQUIRED=2.6 -+ GTK_REQUIRED=2.17.9 - GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" - - dnl Checks for libraries. ---- emacs-23.1/src/xfns.c.orig 2009-08-31 00:03:02.000000000 +0100 -+++ emacs-23.1/src/xfns.c 2009-08-31 00:21:39.000000000 +0100 -@@ -468,8 +468,10 @@ - if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo) - continue; - x = f->output_data.x; -- /* Match if the window is this frame's menubar. */ - #ifdef USE_GTK -+ /* Match if the window is this frame's window (button presses are no longer -+ caught by the menubar) or a menu in the menubar. -+ */ - if (x->menubar_widget) - { - GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc); -@@ -477,13 +479,14 @@ - - BLOCK_INPUT; - if (gwdesc != 0 -- && (gwdesc == x->menubar_widget -+ && (gwdesc == gtk_widget_get_parent (gtk_widget_get_parent (x->menubar_widget)) - || gtk_widget_get_parent (gwdesc) == x->menubar_widget)) - found = 1; - UNBLOCK_INPUT; - if (found) return f; - } - #else -+ /* Match if the window is in this frame's menubar */ - if (x->menubar_widget - && lw_window_is_in_menubar (wdesc, x->menubar_widget)) - return f; diff --git a/emacs.spec b/emacs.spec index 9a00692..6871832 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,7 +4,7 @@ Summary: GNU Emacs text editor Name: emacs Epoch: 1 Version: 23.1 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/emacs/ Group: Applications/Editors @@ -26,7 +26,7 @@ Patch0: glibc-open-macro.patch Patch1: rpm-spec-mode.patch Patch2: po-mode-auto-replace-date-71264.patch Patch3: rpm-spec-mode-utc.patch -Patch4: emacs-gtk.patch + Patch5: emacs-23.1-xdg.patch # Fixed in upstream CVS. Patch6: emacs-23.1-cpp.patch @@ -142,7 +142,6 @@ Emacs packages or see some elisp examples. %prep %setup -q %patch0 -p1 -b .glibc-open-macro -%patch4 -p1 -b .gtk %patch5 -p1 -b .xdg %patch6 -p1 %patch7 -p1 -b .scroll @@ -421,6 +420,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \ %dir %{_datadir}/emacs/%{version} %changelog +* Tue Mar 30 2010 Jonathan G. Underwood - 1:23.1-11 +- Backout unneeded gtk patch + * Tue Mar 30 2010 Jonathan G. Underwood - 1:23.1-10 - Update rpm-spec-mode.el and friends