diff --git a/uhd.spec b/uhd.spec index de61ed6..c6e5771 100644 --- a/uhd.spec +++ b/uhd.spec @@ -19,7 +19,7 @@ Name: uhd URL: http://github.com/EttusResearch/uhd Version: 3.12.0.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv3+ BuildRequires: gcc-c++ BuildRequires: cmake @@ -29,7 +29,7 @@ BuildRequires: python2-mako, python2-requests, python2-devel, tar %if ! %{with binary_firmware} BuildRequires: sdcc sed %endif -Requires(pre): shadow-utils +Requires(pre): shadow-utils, glibc-common Requires: python2-tkinter Summary: Universal Hardware Driver for Ettus Research products Source0: %{url}/archive/v%{version}/uhd-%{version}.tar.gz @@ -144,7 +144,7 @@ pushd host/build make install DESTDIR=%{buildroot} # 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 +sed -i 's/BUS==/SUBSYSTEM==/;s/SYSFS{/ATTRS{/;s/MODE:="0666"/GROUP:="usrp" 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 @@ -195,6 +195,11 @@ mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark %ldconfig_scriptlets +%pre +getent group usrp >/dev/null || \ + %{_sbindir}/groupadd -r usrp >/dev/null 2>&1 +exit 0 + %files %exclude %{_docdir}/%{name}/doxygen %exclude %{_datadir}/uhd/images @@ -230,6 +235,10 @@ mv %{buildroot}${HOME}/.wireshark %{buildroot}%{_libdir}/wireshark %{_libdir}/wireshark/plugins/* %changelog +* Mon Apr 1 2019 Jaroslav Škarvada - 3.12.0.0-5 +- Re-introduced usrp group + Resolves: rhbz#1694665 + * Sun Feb 03 2019 Fedora Release Engineering - 3.12.0.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild