From 87bb653fd2bf0573a91289220e6c162752ee8fe8994175b422424ef0f62393d4 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Tue, 20 Oct 2009 23:13:48 +0000 Subject: [PATCH] Accepting request 22516 from graphics Copy from graphics/libgphoto2 based on submit request 22516 from user msmeissn OBS-URL: https://build.opensuse.org/request/show/22516 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libgphoto2?expand=0&rev=46 --- 03_udev_rules_media_player | 17 +++++++++++++++++ libgphoto2.changes | 5 +++++ libgphoto2.spec | 4 +++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 03_udev_rules_media_player diff --git a/03_udev_rules_media_player b/03_udev_rules_media_player new file mode 100644 index 0000000..c70c74c --- /dev/null +++ b/03_udev_rules_media_player @@ -0,0 +1,17 @@ +# Description: Fix udev rules to identify media players +# Ubuntu: https://launchpad.net/bugs/444083 +# Upstream: https://sourceforge.net/tracker/?func=detail&aid=2877064&group_id=8874&atid=308874 +Index: libgphoto2-2.4.6/packaging/generic/print-camera-list.c +=================================================================== +--- libgphoto2-2.4.6.orig/packaging/generic/print-camera-list.c 2009-10-12 15:57:56.000000000 +0200 ++++ libgphoto2-2.4.6/packaging/generic/print-camera-list.c 2009-10-12 15:58:01.000000000 +0200 +@@ -582,6 +582,9 @@ + } + } + if (has_valid_rule != 0) { ++ if (a->device_type & GP_DEVICE_AUDIO_PLAYER) ++ printf(", ENV{ID_MEDIA_PLAYER}=\"1\""); ++ + if (pdata->script != NULL || pdata->mode != NULL || pdata->owner != NULL || pdata->group != NULL) + printf(", "); + diff --git a/libgphoto2.changes b/libgphoto2.changes index e412dad..c372d68 100644 --- a/libgphoto2.changes +++ b/libgphoto2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 12 17:04:31 CEST 2009 - meissner@suse.de + +- tag mediaplayers correctly in the new style UDEV model. + ------------------------------------------------------------------- Sat Sep 26 11:34:46 CEST 2009 - meissner@suse.de diff --git a/libgphoto2.spec b/libgphoto2.spec index 060682c..6d8a0dc 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -31,8 +31,9 @@ License: LGPL v2.1 or later Group: Hardware/Camera Summary: A Digital Camera Library Version: 2.4.7.1 -Release: 1 +Release: 2 Source0: libgphoto2-%{version}.tar.bz2 +Patch0: 03_udev_rules_media_player BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -151,6 +152,7 @@ Authors: %lang_package %prep %setup -q +%patch0 -p1 %build %{?suse_update_config:%{suse_update_config -f . libgphoto2_port}}