diff --git a/alacarte-0.11.3-pypath.patch b/alacarte-0.11.3-pypath.patch new file mode 100644 index 0000000..c1ce4ce --- /dev/null +++ b/alacarte-0.11.3-pypath.patch @@ -0,0 +1,12 @@ +diff -up alacarte-0.11.3/Alacarte/Makefile.in.pypath alacarte-0.11.3/Alacarte/Makefile.in +--- alacarte-0.11.3/Alacarte/Makefile.in.pypath 2007-02-12 16:20:38.000000000 -0500 ++++ alacarte-0.11.3/Alacarte/Makefile.in 2007-12-02 23:31:46.000000000 -0500 +@@ -204,7 +204,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-appdir = $(pyexecdir)/Alacarte ++appdir = $(pythondir)/Alacarte + app_PYTHON = __init__.py MainWindow.py MenuEditor.py util.py + nodist_app_PYTHON = config.py + CLEANFILES = config.py diff --git a/alacarte.spec b/alacarte.spec index d1aa80e..3002cf1 100644 --- a/alacarte.spec +++ b/alacarte.spec @@ -2,40 +2,35 @@ Name: alacarte Version: 0.11.3 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Simple menu editor for GNOME Group: Applications/System License: LGPLv2+ URL: http://www.gnome.org Source0: http://ftp.gnome.org/pub/gnome/sources/alacarte/0.11/%{name}-%{version}.tar.bz2 +Patch0: alacarte-0.11.3-pypath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python, python-devel, intltool, gettext +BuildRequires: python, python-devel, perl(XML::Parser), gettext BuildRequires: pygtk2-devel BuildRequires: pkgconfig -BuildRequires: gnome-menus-devel >= 2.15.4 -BuildRequires: autoconf, automake -Requires: pygtk2, gnome-python2-gconf -Requires: gnome-menus >= 2.15.4 -Obsoletes: smeg -Provides: smeg-%{version}-%{release} +BuildRequires: gnome-menus-devel >= 2.15.4 +Requires: pygtk2, gnome-python2-gconf +Requires: gnome-menus >= 2.15.4 %description Alacarte is a menu editor for GNOME that lets you get things done, -simply and quickly. +simply and quickly. Just click and type to edit, add, and delete any menu entry. %prep -%setup -q +%setup -q +%patch0 -p1 -b .pypath %build -intltoolize --force -aclocal -autoconf -automake %configure make @@ -71,6 +66,14 @@ fi %{_datadir}/icons/hicolor/scalable/apps/alacarte.svg %changelog +* Sun Dec 02 2007 Todd Zullinger - 0.11.3-5 +- put the python scripts in sitelib, not sitearch +- remove autoconf, automake, and intltool BRs +- don't run autoconf/automake in %%build +- BR perl(XML::Parser) +- remove smeg Obsoletes and Provides +- minor rpmlint cleanups + * Sat Aug 11 2007 Matthias Clasen - 0.11.3-4 - Fix the build with intltool 0.36 - Update the license field @@ -147,7 +150,7 @@ fi * Wed Jun 01 2005 Sindre Pedersen Bjordal - 0.7.1-1 - Rebuilt for 0.7.1 -- Smeg now use the stock gnome menu icon, removed pixmaps from %files +- Smeg now use the stock gnome menu icon, removed pixmaps from %%files * Wed Jun 01 2005 Sindre Pedersen Bjordal - 0.7-2 - Added missing dependency gnome-python2-gconf @@ -157,7 +160,7 @@ fi * Mon May 30 2005 Sindre Pedersen Bjordal - 0.6.2-2 - Added desktop-file-utils to Buildrequires -- Addded desktop-file-utils %post and %postun +- Addded desktop-file-utils %%post and %%postun * Sat May 29 2005 Sindre Pedersen Bjordal - 0.6.2-1 - Rebuilt for 0.6.2 diff --git a/python25.patch b/python25.patch deleted file mode 100644 index 64fc2ef..0000000 --- a/python25.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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) -