From b6f7066e3e23083d00ae3459b29f049043f14b99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
Date: Fri, 29 Aug 2014 15:24:07 +0200
Subject: [PATCH] Migrated udev rule to dynamic ACL management

- Fixed udev rule location
- Group usrp is no more used / created
---
 uhd.spec | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/uhd.spec b/uhd.spec
index d9c452f..b939167 100644
--- a/uhd.spec
+++ b/uhd.spec
@@ -13,7 +13,7 @@
 Name:           uhd
 URL:            http://code.ettus.com/redmine/ettus/projects/uhd/wiki
 Version:        %{ver_major}.%{ver_minor}.%{ver_patch}
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPLv3+
 BuildRequires:  cmake
 BuildRequires:  boost-devel libusb1-devel python-cheetah
@@ -105,10 +105,10 @@ make test
 pushd host/build
 make install DESTDIR=%{buildroot}
 
-# Fix udev rules and allow access only to users in usrp group
-sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp", MODE:="0660"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules
-mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
-mv %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules
+# Fix udev rules and use dynamic ACL management for device
+sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/MODE:="0660", ENV{ID_SOFTWARE_RADIO}="1"/' %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules
+mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d
+mv %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules
 
 # Remove tests, examples binaries
 rm -rf %{buildroot}%{_libdir}/uhd/{tests,examples}
@@ -141,16 +141,13 @@ popd
 
 %postun -p /sbin/ldconfig
 
-%pre
-getent group usrp >/dev/null || groupadd -r usrp >/dev/null
-
 %files
 %exclude %{_docdir}/%{name}/manual
 %exclude %{_docdir}/%{name}/doxygen
 %exclude %{_datadir}/uhd/images
 %doc _tmpdoc/*
 %{_bindir}/*
-%config(noreplace) %{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules
+%{_prefix}/lib/udev/rules.d/10-usrp-uhd.rules
 %config(noreplace) %{_sysconfdir}/security/limits.d/*.conf
 %{_libdir}/lib*.so.*
 %{_libexecdir}/uhd
@@ -171,6 +168,11 @@ getent group usrp >/dev/null || groupadd -r usrp >/dev/null
 %doc %{_docdir}/%{name}/doxygen
 
 %changelog
+* Fri Aug 29 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 3.6.2-6
+- Migrated udev rule to dynamic ACL management
+- Fixed udev rule location
+- Group usrp is no more used / created
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.6.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild