From f7d2cc2e136ff05bb57cf2c5a143a1e92abc1646 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Dec 09 2006 05:24:58 +0000 Subject: python2.5 --- diff --git a/alacarte.spec b/alacarte.spec index 3a17850..0e1a963 100644 --- a/alacarte.spec +++ b/alacarte.spec @@ -2,7 +2,7 @@ Name: alacarte Version: 0.10.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Simple menu editor for GNOME Group: Applications/System @@ -16,10 +16,14 @@ BuildRequires: python, python-devel, intltool, gettext BuildRequires: pygtk2-devel BuildRequires: pkgconfig BuildRequires: gnome-menus-devel >= 2.15.4 +BuildRequires: autoconf Requires: pygtk2, gnome-python2-gconf Requires: gnome-menus >= 2.15.4 Obsoletes: smeg Provides: smeg %{version}-%{release} + +Patch0: python25.patch + %description Alacarte is a menu editor for GNOME that lets you get things done, simply and quickly. @@ -28,8 +32,10 @@ Just click and type to edit, add, and delete any menu entry. %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .python25 %build +autoconf %{configure} make @@ -65,6 +71,9 @@ fi %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg %changelog +* Sat Dec 9 2006 Matthias Clasen - 0.10.1-3 +- try again + * Wed Dec 6 2006 Jeremy Katz - 0.10.1-2 - build against python 2.5 diff --git a/python25.patch b/python25.patch new file mode 100644 index 0000000..64fc2ef --- /dev/null +++ b/python25.patch @@ -0,0 +1,11 @@ +--- alacarte-0.10.1/configure.ac.python 2006-12-09 00:22:36.000000000 -0500 ++++ alacarte-0.10.1/configure.ac 2006-12-09 00:22:57.000000000 -0500 +@@ -19,7 +19,7 @@ + AM_GLIB_GNU_GETTEXT + IT_PROG_INTLTOOL([0.35.0]) + +-AM_PATH_PYTHON_VERSION(2.4, 2.4.0) ++AM_PATH_PYTHON_VERSION(2.4, 2.4.0, 2.5, 2.5.0) + + PKG_CHECK_MODULES(ALACARTE, libgnome-menu >= 2.15) +