Merge remote-tracking branch 'origin/master' into epel7

Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>

uhd.spec

@@ -26,7 +26,7 @@
 Name:           uhd
 URL:            http://code.ettus.com/redmine/ettus/projects/uhd/wiki
 Version:        %{ver_1}.%{ver_2}.%{ver_3}.%{ver_4}
-Release:        8%{?dist}
+Release:        1%{?dist}
 License:        GPLv3+
 BuildRequires:  cmake
 BuildRequires:  boost-devel, libusb1-devel, python-cheetah, ncurses-devel
@@ -174,6 +174,9 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log
 
 %postun -p /sbin/ldconfig
 
+%pre
+getent group usrp >/dev/null || groupadd -r usrp >/dev/null
+
 %files
 %exclude %{_docdir}/%{name}/doxygen
 %exclude %{_datadir}/uhd/images
@@ -209,94 +212,11 @@ install -Dpm 0755 tools/uhd_dump/chdr_log %{buildroot}%{_bindir}/chdr_log
 %{_bindir}/chdr_log
 
 %changelog
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Jul 19 2017 Jonathan Wakely <jwakely@redhat.com> - 3.10.1.0-6
-- Rebuilt for s390x binutils bug
-
-* Tue Jul 04 2017 Jonathan Wakely <jwakely@redhat.com> - 3.10.1.0-5
-- Rebuilt for Boost 1.64
-
-* Mon May 15 2017 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Jan 30 2017 Jonathan Wakely <jwakely@redhat.com> - 3.10.1.0-2
-- Rebuilt for Boost 1.63
-
-* Tue Nov 22 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.10.1.0-1
+* Fri Sep 15 2017 Jaroslav Škarvada <jskarvad@redhat.com> - 3.10.1.0-1
 - New version
-- Dropped base64-decode-fix-off-by-one patch (upstreamed)
-- Switched to new version numbering
-- Switched image archive to xz
 
-* Wed May 25 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.9.4-2
-- Fixed off by one in base64_decode by base64-decode-fix-off-by-one patch
-  Related: rhbz#1308204
-
-* Tue May 10 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.9.4-1
-- New version
-- Dropped 0001-fix-build patch (upstreamed)
-
-* Mon May  9 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 3.8.2-12
-- Rebuilt to fix Boost ABI problem
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.2-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Sat Jan 16 2016 Jonathan Wakely <jwakely@redhat.com> - 3.8.2-10
-- Rebuilt for Boost 1.60
-
-* Thu Aug 27 2015 Jonathan Wakely <jwakely@redhat.com> - 3.8.2-9
-- Rebuilt for Boost 1.59
-
-* Thu Aug 06 2015 Jonathan Wakely <jwakely@redhat.com> 3.8.2-8
-- Bump %release to match f23 branch
-
-* Wed Jul 29 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Changes/F23Boost159
-
-* Wed Jul 22 2015 David Tardon <dtardon@redhat.com> - 3.8.2-6
-- rebuild for Boost 1.58
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.8.2-4
-- Rebuilt for GCC 5 C++11 ABI change
-
-* Thu Mar 12 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.8.2-3
-- Enabled build on ppc64 on RHEL
-
-* Wed Mar 11 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.8.2-2
-- Fixed building without NEON, especially on aarch64
-  Resolves: rhbz#1200836
-
-* Fri Mar  6 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.8.2-1
-- New version
-- Dropped uhd-dump-libs and wireshark-1.12-fix patches (both upstreamed)
-
-* Tue Jan 27 2015 Petr Machata <pmachata@redhat.com> - 3.7.2-2
-- Rebuild for boost 1.57.0
-
-* Mon Sep  1 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.2-1
-- New version
-- Added tools subpackage (wireshark plugin disabled due to rhbz#1129419)
-- Minor packaging fixes
-
-* 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
+* Thu Mar 12 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 3.6.2-5
+- Enabled build on ppc64
 
 * Fri Aug  8 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 3.6.2-4
 - Added workaround for build failure on RHEL-7