rpms/polkit-gnome/devel new-lock-icons.patch, NONE, 1.1 polkit-gnome.spec, 1.20, 1.21

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/polkit-gnome/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25133

Modified Files:
	polkit-gnome.spec 
Added Files:
	new-lock-icons.patch 
Log Message:
Use existing lock icons


new-lock-icons.patch:
 polkitlockbutton.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE new-lock-icons.patch ---
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);


Index: polkit-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/polkit-gnome/devel/polkit-gnome.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- polkit-gnome.spec	15 Jan 2010 19:36:35 -0000	1.20
+++ polkit-gnome.spec	14 Jun 2010 05:22:53 -0000	1.21
@@ -1,13 +1,12 @@
 Summary: PolicyKit integration for the GNOME desktop
 Name: polkit-gnome
 Version: 0.96
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 URL: http://www.freedesktop.org/wiki/Software/PolicyKit
 Group: Applications/System
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.bz2
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel
 BuildRequires: polkit-devel >= 0.95-1
 BuildRequires: desktop-file-utils
@@ -25,6 +24,9 @@ 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.
@@ -55,13 +57,13 @@ Development documentation for polkit-gno
 
 %prep
 %setup -q
+%patch0 -p2 -b .new-lock-icons
 
 %build
 %configure --enable-gtk-doc --disable-introspection
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
@@ -72,15 +74,14 @@ desktop-file-install --delete-original  
   --remove-only-show-in GNOME \
   $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
 
-%if 0%{?fedora} > 12
 echo 'NotShowIn=KDE;' >>$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
-%endif
 
 %find_lang polkit-gnome-1
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
 
 %files -f polkit-gnome-1.lang
 %defattr(-,root,root,-)
@@ -103,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 14 2010 Matthias Clasen <mclasen at redhat.com> - 0.96-2
+- Use lock icons that exist in current icon theme
+- Minor spec file fixes
+
 * Fri Jan 15 2010 David Zeuthen <davidz at redhat.com> - 0.96-1
 - Update to release 0.96
 - Disable introspection support for the time being