From bc32ed4cfeb166fee5952132fc38a12c435ff39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta(a)iki.fi>
Date: Mon, 1 Jun 2015 00:34:57 +0300
Subject: Drop udev rules (#1226698)
diff --git a/vdr-udev.rules b/vdr-udev.rules
deleted file mode 100644
index c475992..0000000
--- a/vdr-udev.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-# VDR friendly udev rules for DVB and other devices.
-
-# See also *-vdr-remote.rules if using the remote plugin.
-
-# See also /etc/security/console.perms.d/*-vdr.perms and
-#
https://bugzilla.redhat.com/202132
-
-# DVB devices
-KERNEL=="dvb*", GROUP="VDR_GROUP", MODE="0660"
-
-# Remote controller, serial port 1 (eg. vdr --rcu=/dev/ttyS0):
-#KERNEL=="ttyS0", GROUP="VDR_GROUP", MODE="0660"
diff --git a/vdr.spec b/vdr.spec
index c6327dd..e2d73f7 100644
--- a/vdr.spec
+++ b/vdr.spec
@@ -24,7 +24,7 @@
Name: vdr
Version: 2.2.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Video Disk Recorder
License: GPLv2+
@@ -33,7 +33,6 @@ Source0: ftp://ftp.tvdr.de/vdr/%{name}-%{version}.tar.bz2
Source1: %{name}.service
Source2: %{name}.sysconfig
Source3: %{name}.sudoers
-Source4: %{name}-udev.rules
Source5: %{name}-reccmds.conf
Source6: %{name}-commands.conf
Source7: %{name}-runvdr.sh
@@ -373,12 +372,6 @@ install -dm 755 $RPM_BUILD_ROOT%{rundir}
touch $RPM_BUILD_ROOT%{rundir}/next-timer
install -dm 755 $RPM_BUILD_ROOT%{vardir}
-install -Dm 644 %{SOURCE4} \
- $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/51-%{name}.rules
-sed -i \
- -e 's/VDR_GROUP/%{vdr_group}/' \
- $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/*-%{name}.rules
-
install -Dpm 644 %{name}.rwtab $RPM_BUILD_ROOT%{_sysconfdir}/rwtab.d/%{name}
install -dm 755 $RPM_BUILD_ROOT%{_pkgdocdir}
@@ -443,6 +436,7 @@ fi
%pre
+# dialout for serial port remote controllers
getent passwd %{vdr_user} >/dev/null || \
useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
-G audio,cdrom,dialout -c "Video Disk Recorder" %{vdr_user} || :
@@ -465,7 +459,6 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
%endif
%config(noreplace) %{_sysconfdir}/sudoers.d/vdr
%config(noreplace) %{_sysconfdir}/sysconfig/vdr
-%config(noreplace) %{_sysconfdir}/udev/rules.d/*-%{name}.rules
%config(noreplace) %{_sysconfdir}/rwtab.d/%{name}
%config %dir %{_sysconfdir}/sysconfig/vdr-plugins.d/
%{_bindir}/epg2html
@@ -561,6 +554,9 @@ useradd -r -g %{vdr_group} -d %{vardir} -s /sbin/nologin -M -N \
%changelog
+* Sun May 31 2015 Ville Skyttä <ville.skytta(a)iki.fi> - 2.2.0-6
+- Drop udev rules (#1226698)
+
* Sat May 02 2015 Kalev Lember <kalevlember(a)gmail.com> - 2.2.0-5
- Rebuilt for GCC 5 C++11 ABI change
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/vdr.git/commit/?h=master&id=bc32ed...