summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@fedoraproject.org>2008-07-09 20:59:14 +0000
committerMatthias Clasen <mclasen@fedoraproject.org>2008-07-09 20:59:14 +0000
commita0a23d3fce8021a8fa3f6e5a28753a1c7481dd8a (patch)
tree64f8739239313d89db58f48a585d0284115753a9
parent57bd955f8a19b887d6a5c7e818050be65c72075c (diff)
downloadgnome-panel-a0a23d3fce8021a8fa3f6e5a28753a1c7481dd8a.tar.gz
gnome-panel-a0a23d3fce8021a8fa3f6e5a28753a1c7481dd8a.tar.xz
gnome-panel-a0a23d3fce8021a8fa3f6e5a28753a1c7481dd8a.zip
use standard icon namesgnome-panel-2_23_4-3_fc10
-rw-r--r--gnome-panel.spec9
-rw-r--r--icon-names.patch12
2 files changed, 20 insertions, 1 deletions
diff --git a/gnome-panel.spec b/gnome-panel.spec
index f97124c..097ece4 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
Summary: GNOME panel
Name: gnome-panel
Version: 2.23.4
-Release: 2%{?dist}
+Release: 3%{?dist}
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-panel/2.23/%{name}-%{version}.tar.bz2
@@ -119,6 +119,9 @@ Patch34: gnome-panel-launch-with-gio.patch
Patch35: clock-wakeups.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=542257
+Patch47: icon-names.patch
+
Conflicts: gnome-power-manager < 2.15.3
%description
@@ -168,6 +171,7 @@ Panel Applets using the libpanel-applet library.
%patch33 -p1 -b .use-gio
%patch34 -p1 -b .launch-with-gio
%patch35 -p1 -b .clock-wakeups
+%patch47 -p1 -b .icon-names
. %{SOURCE6}
@@ -352,6 +356,9 @@ fi
%{_datadir}/gtk-doc/html/*
%changelog
+* Wed Jul 9 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.4-3
+- Use more standard icon names
+
* Tue Jul 8 2008 Matthias Clasen <mclasen@redhat.com> - 2.23.4-2
- Fix debuginfo generation
diff --git a/icon-names.patch b/icon-names.patch
new file mode 100644
index 0000000..855af1b
--- /dev/null
+++ b/icon-names.patch
@@ -0,0 +1,12 @@
+diff -up gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names gnome-panel-2.23.4/gnome-panel/panel-icon-names.h
+--- gnome-panel-2.23.4/gnome-panel/panel-icon-names.h.icon-names 2008-07-09 15:22:29.000000000 -0400
++++ gnome-panel-2.23.4/gnome-panel/panel-icon-names.h 2008-07-09 15:22:43.000000000 -0400
+@@ -25,7 +25,7 @@
+ #define PANEL_ICON_SEPARATOR "gnome-panel-separator"
+ #define PANEL_ICON_SAVED_SEARCH "folder-saved-search"
+ #define PANEL_ICON_SEARCHTOOL "system-search"
+-#define PANEL_ICON_SHUTDOWN "gnome-shutdown"
++#define PANEL_ICON_SHUTDOWN "system-shutdown"
+ #define PANEL_ICON_THEME "preferences-desktop-theme"
+ #define PANEL_ICON_TRASH "user-trash"
+ #define PANEL_ICON_UNKNOWN "image-missing"