Author: jarod
Update of /cvs/free/rpms/mythtv/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13767
Modified Files:
mythbackend.init mythtv.spec
Log Message:
* Sun Jan 30 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-5
- Update to 0.24 fixes, git revision 8921ded85a (rpmfbz#1605, #1585)
- Add BR: libcdio-devel for forthcoming improved BD support
- Fix issue with calling setfacl on non-existent devices (rpmfbz#1604)
Index: mythbackend.init
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythbackend.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythbackend.init 4 Nov 2010 04:09:02 -0000 1.1
+++ mythbackend.init 30 Jan 2011 19:42:37 -0000 1.2
@@ -29,10 +29,18 @@
touch /var/run/mythbackend.pid
if [ "${MYTHBACKEND_USER}" != root ]; then
chown ${MYTHBACKEND_USER}:${MYTHBACKEND_USER} /var/run/mythbackend.pid
- /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/dvb/
- /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/snd/
- /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- /dev/video*
- /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- /dev/vbi*
+ if [ -d /dev/dvb ]; then
+ /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/dvb/
+ fi
+ if [ -d /dev/snd ]; then
+ /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/snd/
+ fi
+ for f in $(ls /dev/video* 2>/dev/null); do
+ /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- $f
+ done
+ for f in $(ls /dev/vbi* 2>/dev/null); do
+ /usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- $f
+ done
fi
export MYTHCONFDIR="$MYTHTV_HOME"
export HOME="$MYTHTV_HOME"
@@ -48,10 +56,18 @@
killproc $binary
RETVAL=$?
if [ "${MYTHBACKEND_USER}" != root ]; then
- /usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/dvb/
- /usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/snd/
- /usr/bin/setfacl -x u:${MYTHBACKEND_USER} /dev/video*
- /usr/bin/setfacl -x u:${MYTHBACKEND_USER} /dev/vbi*
+ if [ -d /dev/dvb ]; then
+ /usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/dvb/
+ fi
+ if [ -d /dev/snd ]; then
+ /usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/snd/
+ fi
+ for f in $(ls /dev/video* 2>/dev/null); do
+ /usr/bin/setfacl -x u:${MYTHBACKEND_USER} $f
+ done
+ for f in $(ls /dev/vbi* 2>/dev/null); do
+ /usr/bin/setfacl -x u:${MYTHBACKEND_USER} $f
+ done
fi
echo
[ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythtv.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- mythtv.spec 23 Jan 2011 03:48:05 -0000 1.84
+++ mythtv.spec 30 Jan 2011 19:42:37 -0000 1.85
@@ -66,7 +66,7 @@
# Git revision and branch ID
# 0.24 release: git tag b0.24
-%define _gitrev 945c67317
+%define _gitrev 8921ded85a
%define branch fixes/0.24
#
@@ -83,7 +83,7 @@
Release: 0.1.git.%{_gitrev}%{?dist}
#Release: 0.1.rc1%{?dist}
%else
-Release: 4%{?dist}
+Release: 5%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
@@ -202,6 +202,7 @@
BuildRequires: libdca-devel
BuildRequires: libdvdnav-devel
BuildRequires: libdvdread-devel >= 0.9.4
+BuildRequires: libcdio-devel
# nb: libdvdcss will be dynamically loaded if installed
BuildRequires: libfame-devel >= 0.9.0
BuildRequires: libogg-devel
@@ -1456,6 +1457,11 @@
################################################################################
%changelog
+* Sun Jan 30 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-5
+- Update to 0.24 fixes, git revision 8921ded85a (rpmfbz#1605, #1585)
+- Add BR: libcdio-devel for forthcoming improved BD support
+- Fix issue with calling setfacl on non-existent devices (rpmfbz#1604)
+
* Sun Jan 16 2011 Jarod Wilson <jarod(a)wilsonet.com> 0.24-4
- Update to 0.24 fixes, git revision 945c67317