New version

Switched to Python 3
  Resolves: rhbz#1738157

uhd.spec

@@ -26,30 +26,33 @@
 %endif
 %endif
 
+%global ver 3.15.0.0
+%global verd 3.14.1.1
+
 Name:           uhd
 URL:            http://github.com/EttusResearch/uhd
-Version:        3.14.1.0
-Release:        1%{?dist}
+Version:        %{ver}
+Release:        0.1.rc2%{?dist}
 License:        GPLv3+
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
-BuildRequires:  boost-devel, libusb1-devel, python2-cheetah, ncurses-devel
-BuildRequires:  python2-docutils, doxygen, pkgconfig, libpcap-devel
-BuildRequires:  python2-numpy
+BuildRequires:  boost-devel, libusb1-devel, python3-cheetah, ncurses-devel
+BuildRequires:  python3-docutils, doxygen, pkgconfig, libpcap-devel
+BuildRequires:  python3-numpy, vim-common
 %if %{with wireshark}
 BuildRequires:  wireshark-devel
 %endif
-BuildRequires:  python2-mako, python2-requests, python2-devel, tar
+BuildRequires:  python3-mako, python3-requests, python3-devel, tar
 %if ! %{with binary_firmware}
 BuildRequires:  sdcc sed
 %endif
 Requires(pre):  shadow-utils, glibc-common
-Requires:       python2-tkinter
+Requires:       python3-tkinter
 Summary:        Universal Hardware Driver for Ettus Research products
 #Source0:       %%{url}/archive/v%%{version}/uhd-%%{version}.tar.gz
-Source0:        %{url}/archive/v%{version}/uhd-%{version}.tar.gz
+Source0:        %{url}/archive/v%{ver}-rc2/uhd-%{ver}-rc2.tar.gz
 Source1:        %{name}-limits.conf
-Source2:        %{url}/releases/download/v%{version}/uhd-images_%{version}.tar.xz
+Source2:        %{url}/releases/download/v%{verd}/uhd-images_%{verd}.tar.xz
 
 %description
 The UHD is the universal hardware driver for Ettus Research products.
@@ -96,7 +99,7 @@ Wireshark dissector plugins.
 %endif
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{ver}-rc2
 
 # firmware
 %if %{with binary_firmware}
@@ -109,7 +112,7 @@ rm -rf images/winusb_driver
 %endif
 
 # fix python shebangs
-find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python2}|' {} \;
+find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python3}|' {} \;
 
 %build
 # firmware
@@ -124,7 +127,7 @@ popd
 
 mkdir -p host/build
 pushd host/build
-%cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python2}" \
+%cmake %{?have_neon} -DPYTHON_EXECUTABLE="%{__python3}" \
   -DUHD_VERSION="%{version}" \
   -DENABLE_TESTS=off ../
 make %{?_smp_mflags}
@@ -156,7 +159,7 @@ popd
 
 %install
 # fix python shebangs (run again for generated scripts)
-find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python2}|' {} \;
+find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{__python3}|' {} \;
 
 pushd host/build
 make install DESTDIR=%{buildroot}
@@ -232,6 +235,7 @@ exit 0
 %{_libexecdir}/uhd
 %{_mandir}/man1/*.1*
 %{_datadir}/uhd
+%{python3_sitearch}/uhd
 
 %files firmware
 %dir %{_datadir}/uhd/images
@@ -257,6 +261,11 @@ exit 0
 %endif
 
 %changelog
+* Fri Nov  8 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.15.0.0-0.1.rc2
+- New version
+- Switched to Python 3
+  Resolves: rhbz#1738157
+
 * Fri Aug  2 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.14.1.0-1
 - New version
 - Disabled tests