From 52ed27313b5d3c6be47f8e2692d6fc8cecfa2cd5 Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: Jul 27 2010 14:02:13 +0000
Subject: patch configure.ac to support python 2.7; regenerate configure script


---

diff --git a/alacarte.spec b/alacarte.spec
index 4247434..dc436c4 100644
--- a/alacarte.spec
+++ b/alacarte.spec
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.13.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Menu editor for the GNOME desktop
 
 Group:          Applications/System
@@ -19,12 +19,14 @@ BuildRequires:  pkgconfig
 BuildRequires:  gnome-menus-devel >= 2.27.92
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
+BuildRequires:  autoconf
 Requires:       pygtk2, gnome-python2-gconf
 Requires:       gnome-menus >= 2.27.92
 
 Patch0:         undo-delete.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=612895
 Patch1:         startup-notify.patch
+Patch2:         python27.patch
 
 %description
 Alacarte is a graphical menu editor that lets you edit, add, and delete
@@ -35,6 +37,10 @@ should work with any desktop environment that uses this specification.
 %setup -q
 %patch0 -p1 -b .undo-delete
 %patch1 -p1 -b .startup-notify
+%patch2 -p1 -b .python27
+
+# Patch 2 requires regenerating the configure script:
+autoreconf
 
 %build
 %configure
@@ -83,6 +89,9 @@ fi
 %{_datadir}/icons/hicolor/256x256/apps/alacarte.png
 
 %changelog
+* Tue Jul 27 2010 David Malcolm <dmalcolm@redhat.com> - 0.13.1-3
+- patch configure.ac to support python 2.7; regenerate configure script
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm@redhat.com> - 0.13.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/python27.patch b/python27.patch
new file mode 100644
index 0000000..cca5232
--- /dev/null
+++ b/python27.patch
@@ -0,0 +1,12 @@
+diff -up alacarte-0.13.1/configure.ac.python27 alacarte-0.13.1/configure.ac
+--- alacarte-0.13.1/configure.ac.python27	2010-07-27 09:49:12.576256802 -0400
++++ alacarte-0.13.1/configure.ac	2010-07-27 09:49:19.906256638 -0400
+@@ -20,7 +20,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
+ AM_GLIB_GNU_GETTEXT
+ IT_PROG_INTLTOOL([0.40.0])
+ 
+-AM_PATH_PYTHON_VERSION(2.6, 2.6.0, 2.5, 2.5.0, 2.4, 2.4.0)
++AM_PATH_PYTHON_VERSION(2.7, 2.7.0, 2.6, 2.6.0, 2.5, 2.5.0, 2.4, 2.4.0)
+ 
+ PKG_CHECK_MODULES(ALACARTE, libgnome-menu >= 2.27.92)
+