From eaea922f4e4f97d0788a2acea770b1c6819a8014 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Mon, 9 Aug 2010 17:17:39 -0400 Subject: [PATCH] * Mon Aug 09 2010 David Zeuthen - 0.97-3 - Nuke patch that was committed upstream --- new-lock-icons.patch | 12 ------------ polkit-gnome.spec | 9 ++++----- 2 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 new-lock-icons.patch diff --git a/new-lock-icons.patch b/new-lock-icons.patch deleted file mode 100644 index 1d1380c..0000000 --- a/new-lock-icons.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up polkit-gnome-0.96/polkitgtk/polkitlockbutton.c.new-icons polkit-gnome-0.96/polkitgtk/polkitlockbutton.c ---- polkit-gnome-0.96/polkitgtk/polkitlockbutton.c.new-icons 2010-06-14 01:16:56.049851488 -0400 -+++ polkit-gnome-0.96/polkitgtk/polkitlockbutton.c 2010-06-14 01:17:17.209606831 -0400 -@@ -749,7 +749,7 @@ update_state (PolkitLockButton *button) - } - } - -- image = gtk_image_new_from_icon_name (button->priv->authorized ? "stock_lock-open" : "stock_lock", -+ image = gtk_image_new_from_icon_name (button->priv->authorized ? "changes-allow" : "changes-prevent", - GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_button_set_image (GTK_BUTTON (button->priv->button), image); - gtk_label_set_text (GTK_LABEL (button->priv->label), text); diff --git a/polkit-gnome.spec b/polkit-gnome.spec index 6cb9f8e..5e8e957 100644 --- a/polkit-gnome.spec +++ b/polkit-gnome.spec @@ -1,7 +1,7 @@ Summary: PolicyKit integration for the GNOME desktop Name: polkit-gnome Version: 0.97 -Release: 1%{?dist} +Release: 3%{?dist} License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/PolicyKit Group: Applications/System @@ -23,9 +23,6 @@ Provides: PolicyKit-authentication-agent Requires: polkit >= 0.95 -# use icons that exist in current icon theme -Patch0: new-lock-icons.patch - %description polkit-gnome provides an authentication agent for PolicyKit that matches the look and feel of the GNOME desktop. @@ -56,7 +53,6 @@ Development documentation for polkit-gnome. %prep %setup -q -%patch0 -p1 -b .new-lock-icons %build %configure --enable-gtk-doc --disable-introspection @@ -103,6 +99,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-a %changelog +* Mon Aug 09 2010 David Zeuthen - 0.97-3 +- Nuke patch that was committed upstream + * Mon Aug 09 2010 David Zeuthen - 0.97-2 - Fix up BRs