rpms/redhat-menus/devel icon-names.patch, NONE, 1.1 redhat-menus.spec, 1.95, 1.96

[Matthias Clasen]

Author: mclasen

Update of /cvs/extras/rpms/redhat-menus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17834

Modified Files:
	redhat-menus.spec 
Added Files:
	icon-names.patch 
Log Message:
use standard icon names


icon-names.patch:

--- NEW FILE icon-names.patch ---
diff -up redhat-menus-8.9.11/desktop-files/Accessories-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Accessories-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Accessories-More.directory.in.icon-names	2008-08-24 22:06:04.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Accessories-More.directory.in	2008-08-24 22:06:14.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=More Accessories
 _Comment=Desktop accessories
-Icon=gnome-util
+Icon=applications-accessories
 Type=Directory
 Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Advanced-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Advanced-More.directory.in
diff -up redhat-menus-8.9.11/desktop-files/AllPrograms.directory.in.icon-names redhat-menus-8.9.11/desktop-files/AllPrograms.directory.in
--- redhat-menus-8.9.11/desktop-files/AllPrograms.directory.in.icon-names	2008-08-24 22:06:47.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/AllPrograms.directory.in	2008-08-24 22:07:02.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=All Applications
 _Comment=All Applications
-Icon=gnome-applications.png
+Icon=applications-office
 Type=Directory
-Encoding=UTF-8
\ No newline at end of file
+Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Desktop.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Desktop.directory.in
--- redhat-menus-8.9.11/desktop-files/Desktop.directory.in.icon-names	2008-08-24 22:07:16.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Desktop.directory.in	2008-08-24 22:07:32.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=System
 _Comment=Personal preferences and administration settings
-Icon=gnome-settings
+Icon=preferences-desktop
 Type=Directory
 Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Development-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Development-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Development-More.directory.in.icon-names	2008-08-24 22:07:50.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Development-More.directory.in	2008-08-24 22:08:12.000000000 -0400
@@ -1,5 +1,5 @@
 [Desktop Entry]
 _Name=More Programming Tools
 _Comment=Tools for software development
-Icon=gnome-devel
+Icon=applications-development
 Type=Directory
diff -up redhat-menus-8.9.11/desktop-files/Documentation.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Documentation.directory.in
--- redhat-menus-8.9.11/desktop-files/Documentation.directory.in.icon-names	2008-08-24 22:08:27.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Documentation.directory.in	2008-08-24 22:08:37.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=Documentation
 _Comment=Manuals and help documents
-Icon=gnome-help.png
+Icon=help-browser
 Type=Directory
-Encoding=UTF-8
\ No newline at end of file
+Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Documentation-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Documentation-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Documentation-More.directory.in.icon-names	2008-08-24 22:08:49.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Documentation-More.directory.in	2008-08-24 22:08:59.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=More Documentation
 _Comment=Manuals and help documents
-Icon=gnome-help.png
+Icon=help-browser
 Type=Directory
-Encoding=UTF-8
\ No newline at end of file
+Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Games-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Games-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Games-More.directory.in.icon-names	2008-08-24 22:09:53.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Games-More.directory.in	2008-08-24 22:10:05.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=More Games
 _Comment=Games and amusements
-Icon=gnome-joystick
+Icon=applications-games
 Type=Directory
 Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Graphics-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Graphics-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Graphics-More.directory.in.icon-names	2008-08-24 22:10:16.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Graphics-More.directory.in	2008-08-24 22:10:38.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=More Graphics Applications
 _Comment=Graphics applications
-Icon=gnome-graphics
+Icon=applications-graphics
 Type=Directory
 Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Internet-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Internet-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Internet-More.directory.in.icon-names	2008-08-24 22:10:45.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Internet-More.directory.in	2008-08-24 22:10:57.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=More Internet Applications
 _Comment=Programs for Internet access such as web and email
-Icon=gnome-globe
+Icon=applications-internet
 Type=Directory
 
diff -up redhat-menus-8.9.11/desktop-files/Multimedia-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Multimedia-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Multimedia-More.directory.in.icon-names	2008-08-24 22:11:05.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Multimedia-More.directory.in	2008-08-24 22:11:19.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=More Sound & Video Applications
 _Comment=Multimedia menu
-Icon=gnome-multimedia
+Icon=applications-multimedia
 Type=Directory
 Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Office-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Office-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Office-More.directory.in.icon-names	2008-08-24 22:11:28.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Office-More.directory.in	2008-08-24 22:13:50.000000000 -0400
@@ -1,5 +1,5 @@
 [Desktop Entry]
 _Name=More Office Applications
 _Comment=Additional office applications
-Icon=gnome-applications
+Icon=applications-office
 Type=Directory
diff -up redhat-menus-8.9.11/desktop-files/Root.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Root.directory.in
--- redhat-menus-8.9.11/desktop-files/Root.directory.in.icon-names	2008-08-24 22:14:37.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Root.directory.in	2008-08-24 22:14:44.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=Programs
 _Comment=Programs menu
-Icon=gnome-folder.png
+Icon=folder
 Type=Directory
 Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/ServerConfig.directory.in.icon-names redhat-menus-8.9.11/desktop-files/ServerConfig.directory.in
--- redhat-menus-8.9.11/desktop-files/ServerConfig.directory.in.icon-names	2008-08-24 22:15:31.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/ServerConfig.directory.in	2008-08-24 22:15:50.000000000 -0400
@@ -2,5 +2,5 @@
 Type=Directory
 _Name=Server Settings
 _Comment=Configure network services (web server, DNS server, etc.)
-Icon=redhat-server_settings.png
+Icon=preferences-system-network
 Terminal=0
diff -up redhat-menus-8.9.11/desktop-files/ServerConfig-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/ServerConfig-More.directory.in
--- redhat-menus-8.9.11/desktop-files/ServerConfig-More.directory.in.icon-names	2008-08-24 22:16:01.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/ServerConfig-More.directory.in	2008-08-24 22:16:15.000000000 -0400
@@ -2,5 +2,5 @@
 Type=Directory
 _Name=More Server Settings
 _Comment=Configure network services (web server, DNS server, etc.)
-Icon=redhat-server_settings.png
+Icon=preferences-system-network
 Terminal=0
diff -up redhat-menus-8.9.11/desktop-files/Settings-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Settings-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Settings-More.directory.in.icon-names	2008-08-24 22:17:19.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Settings-More.directory.in	2008-08-24 22:17:27.000000000 -0400
@@ -1,5 +1,5 @@
 [Desktop Entry]
 _Name=More Preferences
 _Comment=Personal preferences and settings
-Icon=gnome-settings
+Icon=preferences-desktop
 Type=Directory
diff -up redhat-menus-8.9.11/desktop-files/SystemConfig.directory.in.icon-names redhat-menus-8.9.11/desktop-files/SystemConfig.directory.in
--- redhat-menus-8.9.11/desktop-files/SystemConfig.directory.in.icon-names	2008-08-24 22:18:28.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/SystemConfig.directory.in	2008-08-24 22:18:40.000000000 -0400
@@ -2,6 +2,6 @@
 Type=Directory
 _Name=Administration
 _Comment=Change systemwide settings (affects all users)
-Icon=redhat-system_settings.png
+Icon=preferences-system
 Terminal=0
 Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/SystemConfig-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/SystemConfig-More.directory.in
--- redhat-menus-8.9.11/desktop-files/SystemConfig-More.directory.in.icon-names	2008-08-24 22:18:07.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/SystemConfig-More.directory.in	2008-08-24 22:18:19.000000000 -0400
@@ -2,6 +2,6 @@
 Type=Directory
 _Name=More System Settings
 _Comment=Change systemwide settings (affects all users)
-Icon=redhat-system_settings.png
+Icon=preferences-system
 Terminal=0
 Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/System-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/System-More.directory.in
--- redhat-menus-8.9.11/desktop-files/System-More.directory.in.icon-names	2008-08-24 22:17:35.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/System-More.directory.in	2008-08-24 22:17:55.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=More System Tools
 _Comment=System configuration and monitoring
-Icon=gnome-system
+Icon=applications-system
 Type=Directory
 Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Utilities.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Utilities.directory.in
--- redhat-menus-8.9.11/desktop-files/Utilities.directory.in.icon-names	2008-08-24 22:19:10.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Utilities.directory.in	2008-08-24 22:19:22.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=Utilities
 _Comment=Utilities 
-Icon=gnome-util.png
+Icon=applications-accessories
 Type=Directory
-Encoding=UTF-8
\ No newline at end of file
+Encoding=UTF-8
diff -up redhat-menus-8.9.11/desktop-files/Utilities-More.directory.in.icon-names redhat-menus-8.9.11/desktop-files/Utilities-More.directory.in
--- redhat-menus-8.9.11/desktop-files/Utilities-More.directory.in.icon-names	2008-08-24 22:18:51.000000000 -0400
+++ redhat-menus-8.9.11/desktop-files/Utilities-More.directory.in	2008-08-24 22:19:04.000000000 -0400
@@ -1,6 +1,6 @@
 [Desktop Entry]
 _Name=More Utilities
 _Comment=Utilities 
-Icon=gnome-util.png
+Icon=applications-accessories
 Type=Directory
-Encoding=UTF-8
\ No newline at end of file
+Encoding=UTF-8


Index: redhat-menus.spec
===================================================================
RCS file: /cvs/extras/rpms/redhat-menus/devel/redhat-menus.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- redhat-menus.spec	14 Aug 2008 01:17:42 -0000	1.95
+++ redhat-menus.spec	25 Aug 2008 02:21:43 -0000	1.96
@@ -4,7 +4,7 @@
 Summary: Configuration and data files for the desktop menus
 Name: redhat-menus
 Version: 8.9.11
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.redhat.com
 Source0: %{name}-%{version}.tar.gz
 License: GPL+
@@ -29,6 +29,7 @@
 Patch1: redhat-menus-8.9.11-pirut.patch
 # directory files got renamed in gnome-menus for silly reasons
 Patch2: redhat-menus-8.9.11-directory-rename.patch
+Patch3: icon-names.patch
 
 %description
 
@@ -41,6 +42,7 @@
 %patch0 -p1 -b .evolution
 %patch1 -p1 -b .pirut
 %patch2 -p1 -b .directory-rename
+%patch3 -p1 -b .icon-names
 
 %build
 intltoolize --force
@@ -86,6 +88,9 @@
 %{_datadir}/desktop-directories/*.directory
 
 %changelog
+* Sun Aug 24 2008 Matthias Clasen <mclasen at redhat.com> - 8.9.11-6
+- Use standard icon names where available 
+
 * Wed Aug 13 2008 Matthias Clasen <mclasen at redhat.com> - 8.9.11-5
 - Own /etc/xdg/menus