From 4e78170e46980e5f8430d0106b29c581bab6fbb8 Mon Sep 17 00:00:00 2001 From: Jasper St. Pierre Date: Jun 01 2012 16:04:43 +0000 Subject: Update to 0.13.4 --- diff --git a/.gitignore b/.gitignore index ede0583..d67ccb0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ alacarte-0.13.1.tar.bz2 /alacarte-0.13.2.tar.bz2 +/alacarte-0.13.4.tar.xz diff --git a/alacarte-0.11.3-pypath.patch b/alacarte-0.11.3-pypath.patch deleted file mode 100644 index c1ce4ce..0000000 --- a/alacarte-0.11.3-pypath.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 d45514e..9d03ad7 100644 --- a/alacarte.spec +++ b/alacarte.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: alacarte -Version: 0.13.2 +Version: 0.13.4 Release: 4%{?dist} Summary: Menu editor for the GNOME desktop @@ -9,12 +9,12 @@ Group: Applications/System License: LGPLv2+ URL: http://www.gnome.org #VCS: git:git://git.gnome.org/alacarte -Source0: http://download.gnome.org/sources/alacarte/0.13/%{name}-%{version}.tar.bz2 +Source0: http://download.gnome.org/sources/alacarte/0.13/%{name}-%{version}.tar.xz BuildArch: noarch BuildRequires: python, python-devel, gettext -BuildRequires: pygtk2-devel +BuildRequires: pygobject3-devel BuildRequires: pkgconfig BuildRequires: gnome-menus-devel >= 2.27.92 BuildRequires: intltool @@ -24,10 +24,6 @@ Requires: pygtk2, gnome-python2-gconf Requires: gnome-menus >= 2.27.92 Requires: gnome-panel -Patch0: undo-delete.patch -# https://bugzilla.gnome.org/show_bug.cgi?id=612895 -Patch1: startup-notify.patch - %description Alacarte is a graphical menu editor that lets you edit, add, and delete menu entries. It follows the freedesktop.org menu specification and @@ -35,16 +31,12 @@ should work with any desktop environment that uses this specification. %prep %setup -q -%patch0 -p1 -b .undo-delete -%patch1 -p1 -b .startup-notify - -# Patch 2 requires regenerating the configure script: -autoreconf %build %configure make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' @@ -88,6 +80,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/256x256/apps/alacarte.png %changelog +* Fri Jun 01 2012 Jasper St. Pierre - 0.13.4-1 +- Update to 0.13.4. Resolves: #734442 + * Thu Jan 12 2012 Fedora Release Engineering - 0.13.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/python27.patch b/python27.patch deleted file mode 100644 index cca5232..0000000 --- a/python27.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) - diff --git a/sources b/sources index 5d7d616..68d80cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -de84e437babebe036ab8dc9a518282ca alacarte-0.13.2.tar.bz2 +123634cab8d2af0f3ef1ad6404648580 alacarte-0.13.4.tar.xz diff --git a/startup-notify.patch b/startup-notify.patch deleted file mode 100644 index 2144714..0000000 --- a/startup-notify.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up alacarte-0.12.4/data/alacarte.desktop.in.in.startup-notify alacarte-0.12.4/data/alacarte.desktop.in.in ---- alacarte-0.12.4/data/alacarte.desktop.in.in.startup-notify 2010-03-14 16:00:44.600736393 -0400 -+++ alacarte-0.12.4/data/alacarte.desktop.in.in 2010-03-14 16:01:30.632733811 -0400 -@@ -4,7 +4,7 @@ _Comment=Change which applications are s - Exec=alacarte - Terminal=false - Type=Application --StartupNotify=false -+StartupNotify=true - Categories=GNOME;Settings;DesktopSettings; - NotShowIn=KDE; - Icon=alacarte diff --git a/undo-delete.patch b/undo-delete.patch deleted file mode 100644 index 06cf820..0000000 --- a/undo-delete.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up alacarte-0.11.6/Alacarte/MenuEditor.py.undo-delete alacarte-0.11.6/Alacarte/MenuEditor.py ---- alacarte-0.11.6/Alacarte/MenuEditor.py.undo-delete 2008-10-17 22:20:26.000000000 -0400 -+++ alacarte-0.11.6/Alacarte/MenuEditor.py 2008-10-17 22:20:35.000000000 -0400 -@@ -344,8 +344,8 @@ class MenuEditor: - self.save() - - def deleteItem(self, item): -- self.__writeItem(item, hidden=True) - self.__addUndo([item,]) -+ self.__writeItem(item, hidden=True) - self.save() - - def deleteMenu(self, menu):