From 1eb9bcd89e9fab942f57b75175480f0b90fd5cd4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Jun 27 2012 02:39:57 +0000
Subject: Cleanups


---

diff --git a/alacarte.spec b/alacarte.spec
index 9d03ad7..c83380d 100644
--- a/alacarte.spec
+++ b/alacarte.spec
@@ -2,7 +2,7 @@
 
 Name:           alacarte
 Version:        0.13.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Menu editor for the GNOME desktop
 
 Group:          Applications/System
@@ -20,25 +20,27 @@ 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
-Requires:       gnome-panel
+Requires:       gnome-menus >= 3.2.0.1
+Requires:       gtk3
+Requires:       pygobject-3.0
+
 
 %description
 Alacarte is a graphical menu editor that lets you edit, add, and delete
 menu entries. It follows the freedesktop.org menu specification and
 should work with any desktop environment that uses this specification.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 # desktop-file-install can't manipulate NotShowIn
@@ -47,26 +49,25 @@ sed -i -e 's/NotShowIn=KDE;/OnlyShowIn=GNOME;/' \
 desktop-file-validate \
   $RPM_BUILD_ROOT%{_datadir}/applications/alacarte.desktop
 
-
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %postun
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
+
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc README AUTHORS COPYING
 %{python_sitelib}/Alacarte
 %{_bindir}/alacarte
@@ -79,8 +80,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/48x48/apps/alacarte.png
 %{_datadir}/icons/hicolor/256x256/apps/alacarte.png
 
+
 %changelog
-* Fri Jun 01 2012 Jasper St. Pierre <jstpierre@mecheye.net> - 0.13.4-1
+* Tue Jun 26 2012 Matthias Clasen <mclasen@redhat.com> - 0.13.4-5
+- Spec file cleanups
+- Drop gnome-panel dep
+
+* Fri Jun 01 2012 Jasper St. Pierre <jstpierre@mecheye.net> - 0.13.4-5
 - Update to 0.13.4. Resolves: #734442
 
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.13.2-4