rpms/DeviceKit-disks/F-12 media-player.patch, NONE, 1.1 DeviceKit-disks.spec, 1.36, 1.37

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/DeviceKit-disks/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv324

Modified Files:
	DeviceKit-disks.spec 
Added Files:
	media-player.patch 
Log Message:
give media players better icons


media-player.patch:
 95-devkit-disks.rules |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE media-player.patch ---
>From 710d11c61c5c2c5b6f69d8a8a8f85ef642c6fd59 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt at ubuntu.com>
Date: Tue, 13 Oct 2009 20:15:46 +0200
Subject: [PATCH 4/4] =?utf-8?q?Bug=2024499=20=E2=80=93=20media=20players=20have=20USB=20drive=20icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit

Set "media-player" icon for devices which have ID_MEDIA_PLAYER (as set by
media-player-info).
---
 data/95-devkit-disks.rules |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/data/95-devkit-disks.rules b/data/95-devkit-disks.rules
index fbb85a0..e383e6c 100644
--- a/data/95-devkit-disks.rules
+++ b/data/95-devkit-disks.rules
@@ -91,6 +91,10 @@ ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:1", ENV{
 ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:2", ENV{ID_DRIVE_FLASH_SD}="1"
 ATTRS{idVendor}=="05e3", ATTRS{idProduct}=="070e", ENV{ID_INSTANCE}=="0:3", ENV{ID_DRIVE_FLASH_MS}="1"
 
+# Generic music player
+#
+ENV{ID_MEDIA_PLAYER}=="?*", ENV{DKD_PRESENTATION_ICON_NAME}="multimedia-player"
+
 # Apple iPod Video
 #
 ATTRS{idVendor}=="05ac", ATTRS{idProduct}=="1209", ENV{DKD_PRESENTATION_ICON_NAME}="multimedia-player-ipod-white"
-- 
1.6.3.3




Index: DeviceKit-disks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/DeviceKit-disks/F-12/DeviceKit-disks.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- DeviceKit-disks.spec	5 Oct 2009 19:01:42 -0000	1.36
+++ DeviceKit-disks.spec	13 Oct 2009 22:26:25 -0000	1.37
@@ -12,7 +12,7 @@
 Summary: Disk Management Service
 Name: DeviceKit-disks
 Version: 007
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://cgit.freedesktop.org/DeviceKit/DeviceKit-disks/
@@ -56,6 +56,8 @@ Requires: ntfsprogs
 %endif
 
 Patch0: 0001-Actually-inhibit-the-daemon-when-Inhibit-is-called.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=24499
+Patch1: media-player.patch
 
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
@@ -77,6 +79,7 @@ D-Bus interface definitions for DeviceKi
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .media-player
 
 %build
 %configure --enable-gtk-doc
@@ -143,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Tue Oct 13 2009 Matthias Clasen <mclasen at redhat.com> - 007-5%{?dist}
+- Give media players better icons
+
 * Mon Oct 05 2009 David Zeuthen <davidz at redhat.com> - 007-4%{?dist}
 - Rebuild