[vdr] Add vdr user to the cdrom group, drop related console.perms example.

[Ville Skyttä]

commit d906bdeb7f982bf2713079b5ca1f005b6019ec1a
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Oct 17 23:38:50 2010 +0300

    Add vdr user to the cdrom group, drop related console.perms example.

 vdr.consoleperms |    4 ----
 vdr.spec         |   11 +++++++++--
 2 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/vdr.consoleperms b/vdr.consoleperms
index 30f32c8..dca3127 100644
--- a/vdr.consoleperms
+++ b/vdr.consoleperms
@@ -6,10 +6,6 @@
 <vdrdvb>=/dev/dvb/adapter*/*
 <console>  0660 <vdrdvb>     0660 root.VDR_GROUP
 
-# Optical drives; uncomment/adjust if you want to use them with VDR:
-#<vdroptical>=/dev/cdrom* /dev/cdrw* /dev/cdwriter* /dev/dvd*
-#<console>  0660 <vdroptical> 0660 root.VDR_GROUP
-
 # Remote controller, serial port 1 (eg. vdr --rcu=/dev/ttyS0):
 #<vdrremote>=/dev/ttyS0
 # Remote controller, /dev/input/event2 (using the remote plugin):
diff --git a/vdr.spec b/vdr.spec
index a7eb27f..62c162e 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -8,6 +8,7 @@
 # - pause patch (causes OSD placement issues at least with unrebuilt text2skin)
 #   http://www.tolleri.net/vdr/vdr/vdr-1.6.0-2-pause-0.0.1.patch
 #   http://thread.gmane.org/gmane.linux.vdr/40188
+# - drop console.perms stuff altogether?
 
 %bcond_with       docs
 %bcond_with       plugins
@@ -115,7 +116,7 @@ BuildRequires:  lirc-devel
 BuildRequires:  doxygen
 BuildRequires:  graphviz
 %endif # docs
-# udev >= 136-1 for the video group
+# udev >= 136-1 for the cdrom and video groups
 Requires:       udev >= 136-1
 # sudo for the shutdown script, >= 1.7.2p2-3 for sudoers.d functionality
 Requires:       sudo >= 1.7.2p2-3
@@ -124,6 +125,7 @@ Requires:       util-linux-ng >= 2.17
 # shadow-utils >= 4.1.1 for useradd -N
 Requires(pre):  shadow-utils >= 2:4.1.1
 Requires(post): /sbin/chkconfig
+Requires(post): shadow-utils
 Requires(preun): /sbin/chkconfig
 Provides:       vdr(abi)%{?_isa} = %{apiver}
 %if "%{?_isa}" != ""
@@ -447,7 +449,9 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
 :
 
 %post
-/sbin/chkconfig --add vdr || :
+usermod -a -G cdrom %{vdr_user}
+/sbin/chkconfig --add vdr
+:
 
 %preun
 if [ $1 -eq 0 ] ; then
@@ -538,6 +542,9 @@ fi
 %endif # plugins
 
 %changelog
+* Sun Oct 17 2010 Ville Skyttä <ville.skytta at iki.fi>
+- Add vdr user to the cdrom group, drop related console.perms example.
+
 * Thu Jul  8 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.6.0-33
 - Include COPYING in -docs.