[uhd] Minor tweaks to %pre scriptlet Fixed udev rules Added tkinter requires Resolves: rhbz#769678

[Jaroslav Škarvada]

commit 08f4c58631da4b4b369e84ae8e1d1237f8cee8ea
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Jan 11 23:59:26 2012 +0100

    Minor tweaks to %pre scriptlet
    Fixed udev rules
    Added tkinter requires
    Resolves: rhbz#769678

 uhd.spec |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)
---
diff --git a/uhd.spec b/uhd.spec
index 53d1809..12c9229 100644
--- a/uhd.spec
+++ b/uhd.spec
@@ -9,11 +9,13 @@
 Name:           uhd
 URL:            http://code.ettus.com/redmine/ettus/projects/uhd/wiki
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv3+
 BuildRequires:  cmake
 BuildRequires:  boost-devel libusb1-devel python-cheetah
 BuildRequires:  docutils doxygen pkgconfig
+Requires(pre):  shadow-utils
+Requires:       tkinter
 Group:          Applications/Engineering
 Summary:        Universal Hardware Driver for Ettus Research products
 Source0:        %{name}-%{version}.tar.gz
@@ -40,8 +42,8 @@ make test
 pushd host/build
 make install DESTDIR=%{buildroot}
 
-# Allow access only to users in usrp group
-sed -i 's/MODE:="0666"/MODE:="0660"/' %{buildroot}%{_datadir}/uhd/utils/uhd-usrp.rules
+# 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}%{_datadir}/uhd/utils/uhd-usrp.rules
 mkdir -p %{buildroot}%{_sysconfdir}/udev/rules.d
 mv %{buildroot}%{_datadir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_sysconfdir}/udev/rules.d/10-usrp-uhd.rules
 
@@ -77,8 +79,8 @@ BuildArch:      noarch
 %description doc
 Documentation for the Universal Hardware Driver (UHD).
 
-%pre -n uhd
-getent group usrp >/dev/null || groupadd -r usrp
+%pre
+getent group usrp >/dev/null || groupadd -r usrp >/dev/null
 
 %files
 %doc _tmpdoc/*
@@ -97,6 +99,12 @@ getent group usrp >/dev/null || groupadd -r usrp
 %doc %{_docdir}/%{name}/*
 
 %changelog
+* Wed Jan 11 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 3.3.1-2
+- Minor tweaks to %%pre scriptlet
+- Fixed udev rules
+- Added tkinter requires
+  Resolves: rhbz#769678
+
 * Fri Dec  2 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 3.3.1-1
 - New version