[argyllcms/f17] Remove obsolete udev sections

[Richard Hughes]

commit f3cbed5559151c91dba2c28329ff4dd076f9caf1
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Mar 22 16:35:42 2012 +0000

    Remove obsolete udev sections
    
    - Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=785729

 argyllcms.spec                      |   11 ++++++++++-
 remove-obsolete-udev-sections.patch |   17 +++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/argyllcms.spec b/argyllcms.spec
index a1e740b..fdf2e0c 100644
--- a/argyllcms.spec
+++ b/argyllcms.spec
@@ -1,12 +1,16 @@
 Name:    argyllcms
 Version: 1.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: ICC compatible color management system
 Group:   User Interface/X
 License: GPLv3 and MIT
 URL:     http://gitorious.org/hargyllcms
 Source0: http://people.freedesktop.org/~hughsient/releases/hargyllcms-%{version}.tar.xz
 
+# From upstream: remove the plugdev and ConsoleKit stuff
+# see https://bugzilla.redhat.com/show_bug.cgi?id=785729 for details.
+Patch0:    remove-obsolete-udev-sections.patch
+
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: libtool
@@ -50,6 +54,7 @@ This package contains the Argyll color management system documentation.
 
 %prep
 %setup -q -n hargyllcms-%{version}
+%patch0 -p1 -b .remove-obsolete-udev-sections
 autoreconf
 automake
 libtoolize --force
@@ -90,6 +95,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libargyll*.so
 %doc doc/*.html doc/*.jpg
 
 %changelog
+* Thu Mar 22 2012 Richard Hughes <rhughes at redhat.com> - 1.3.6-2
+- Remove obsolete udev sections
+- Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=785729
+
 * Mon Mar 19 2012 Richard Hughes <rhughes at redhat.com> - 1.3.6-1
 - Update to 1.3.5
 - Add a -V option to spotread to allow tracking reading consistency.
diff --git a/remove-obsolete-udev-sections.patch b/remove-obsolete-udev-sections.patch
new file mode 100644
index 0000000..875a01b
--- /dev/null
+++ b/remove-obsolete-udev-sections.patch
@@ -0,0 +1,17 @@
+diff -urNp hargyllcms-1.3.6.old/libusb/55-Argyll.rules hargyllcms-1.3.6/libusb/55-Argyll.rules
+--- hargyllcms-1.3.6.old/libusb/55-Argyll.rules	2012-03-22 16:30:39.750184382 +0000
++++ hargyllcms-1.3.6/libusb/55-Argyll.rules	2012-03-22 16:30:53.121184883 +0000
+@@ -43,11 +43,8 @@ ATTRS{idVendor}=="085c", ATTRS{idProduct
+ # Huey
+ ATTRS{idVendor}=="0971", ATTRS{idProduct}=="2005", ENV{COLOR_MEASUREMENT_DEVICE}="1"
+ 
+-# Let udev-acl and ConsoleKit manage these devices, if applicable
+-TEST=="/lib/udev/udev-acl", TEST=="/var/run/ConsoleKit/database", ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}="1"
+-
+-# Otherwise, restrict access to members of the plugdev group
+-ENV{COLOR_MEASUREMENT_DEVICE}=="*?", ENV{ACL_MANAGE}!="*?", MODE="660", GROUP="plugdev"
++# ColorHug
++ATTRS{idVendor}=="04d8", ATTRS{idProduct}=="f8da", ENV{COLOR_MEASUREMENT_DEVICE}="1"
+ 
+ # Set ID_VENDOR and ID_MODEL acording to VID and PID
+ IMPORT{program}="usb-db %p"