From 4fa3497e435d290dde4a9153e2aaebde35c3ec64 Mon Sep 17 00:00:00 2001
From: Jaroslav Škarvada <jskarvad@redhat.com>
Date: Nov 11 2019 22:47:25 +0000
Subject: New version

Switched to Python 3
  Resolves: rhbz#1738963

---

diff --git a/.gitignore b/.gitignore
index 1fa1e2c..91a27d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gr-air-modes-*.tar.bz2
 /gr-air-modes-20160831git3bad1f5d.tar.gz
+/gr-air-modes-20191111gita2f2627c.tar.gz
diff --git a/gr-air-modes-modes_gui-traceback-fix.patch b/gr-air-modes-modes_gui-traceback-fix.patch
deleted file mode 100644
index ebd6d61..0000000
--- a/gr-air-modes-modes_gui-traceback-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From d4d17bc4dbe19140068d83424c8b68569a9a6ded Mon Sep 17 00:00:00 2001
-From: Geoffrey Marr <gmarr@redhat.com>
-Date: Thu, 1 Sep 2016 08:45:39 -0600
-Subject: [PATCH] Modified gr-air-modes/apps/modes_gui to add correct az_map
- problem.
-
----
- apps/modes_gui | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/apps/modes_gui b/apps/modes_gui
-index 5ef549e..e39c88b 100755
---- a/apps/modes_gui
-+++ b/apps/modes_gui
-@@ -107,7 +107,7 @@ class mainwindow(QtGui.QMainWindow):
-         self.ui.list_aircraft.setModel(self.datamodel)
-         self.ui.list_aircraft.setModelColumn(0)
- 
--        self.az_model = air_modes.az_map_model(None)
-+        self.az_model = air_modes.az_map.az_map_model(None)
-         self.ui.azimuth_map.setModel(self.az_model)
- 
-         #set up dashboard views
-@@ -351,7 +351,7 @@ class mainwindow(QtGui.QMainWindow):
- 
-             #add azimuth map output and hook it up
-             if my_position is not None:
--                self.az_map_output = air_modes.az_map_output(self._cpr_dec, self.az_model, self._publisher)
-+                self.az_map_output = air_modes.az_map.az_map_output(self._cpr_dec, self.az_model, self._publisher)
-                 #self._relay.subscribe("dl_data", self.az_map_output.output)
- 
-             #set up map
diff --git a/gr-air-modes.spec b/gr-air-modes.spec
index 9e8f652..78c099b 100644
--- a/gr-air-modes.spec
+++ b/gr-air-modes.spec
@@ -1,6 +1,6 @@
 # git ls-remote git://github.com/bistromath/gr-air-modes.git
-%global git_commit 3bad1f5d35f8f2e9ff93b7833274ee479d03daac
-%global git_date 20160831
+%global git_commit a2f2627c5421368b8af1b57ca9818e1c79d4f4f0
+%global git_date 20191111
 
 %global git_short_commit %(echo %{git_commit} | cut -c -8)
 %global git_suffix %{git_date}git%{git_short_commit}
@@ -8,23 +8,18 @@
 Name:             gr-air-modes
 URL:              http://github.com/bistromath/gr-air-modes
 Version:          0
-Release:          0.68.%{git_suffix}%{?dist}
+Release:          0.69.%{git_suffix}%{?dist}
 License:          GPLv3+
-BuildRequires:    cmake, gcc-c++, python2-devel, numpy, scipy, gnuradio-devel
+BuildRequires:    cmake, gcc-c++, python3-devel, python3-numpy, python3-scipy, gnuradio-devel
 BuildRequires:    sqlite-devel, uhd-devel, boost-devel, doxygen, graphviz
-BuildRequires:    swig, PyQt4-devel, python2-zmq
-# PyQwt dropped in f31+, upstream ticket suggesting migration to PyQtGraph:
-# https://github.com/bistromath/gr-air-modes/issues/104
-%if 0%{?fedora} < 31
-BuildRequires:    qwt-devel
-%endif
-Requires:         numpy, scipy, PyQt4, python2-zmq
-%if 0%{?fedora} < 31
-Requires:         PyQwt
-%endif
+BuildRequires:    swig, python3-zmq, log4cpp-devel, gmp-devel, mpir-devel
+BuildRequires:    orc-devel, python3-pyqtgraph
+# TODO: check whether qwt is needed
+BuildRequires:    qwt5-qt4-devel
+Requires:         python3-numpy, python3-scipy, python3-zmq
+Requires:         qwt5-qt4
 Summary:          SDR receiver for Mode S transponder signals (ADS-B)
-Patch0:           gr-air-modes-modes_gui-traceback-fix.patch
-Source0:          https://github.com/bistromath/gr-air-modes/archive/%{git_commit}.tar.gz#/%{name}-%{git_suffix}.tar.gz
+Source0:          https://github.com/bistromath/gr-air-modes/archive/%{git_commit}/%{name}-%{git_suffix}.tar.gz
 
 %description
 Software defined radio receiver for Mode S transponder signals, including
@@ -60,18 +55,13 @@ cd build
 make install DESTDIR=%{buildroot}
 
 # remove hashbangs
-pushd %{buildroot}%{python2_sitearch}/air_modes
+pushd %{buildroot}%{python3_sitearch}/air_modes
 for f in *.py
 do
   sed -i '/^[ \t]*#!\/usr\/bin\/\(env\|python\)/ d' $f
 done
 popd
 
-# fix docs
-mkdir -p %{buildroot}%{_docdir}/%{name}
-mv %{buildroot}%{_docdir}/gr-gr-air-modes/* %{buildroot}%{_docdir}/%{name}/
-rmdir %{buildroot}%{_docdir}/gr-gr-air-modes
-
 %ldconfig_scriptlets
 
 %files
@@ -82,11 +72,12 @@ rmdir %{buildroot}%{_docdir}/gr-gr-air-modes
 %{_bindir}/modes_gui
 %{_bindir}/modes_rx
 %{_libdir}/*.so.*
-%{python2_sitearch}/*
+%{python3_sitearch}/*
 
 %files devel
 %{_includedir}/gr_air_modes
 %{_libdir}/*.so
+%{_libdir}/cmake/%{name}/*.cmake
 
 
 %files doc
@@ -94,6 +85,11 @@ rmdir %{buildroot}%{_docdir}/gr-gr-air-modes
 %doc %{_docdir}/%{name}/xml
 
 %changelog
+* Mon Nov 11 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 0-0.69.20191111gita2f2627c
+- New version
+- Switched to Python 3
+  Resolves: rhbz#1738963
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.68.20160831git3bad1f5d
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 0f90c8d..f82c2b0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca42020fbdaa74f267bc4bca14cdb98e  gr-air-modes-20160831git3bad1f5d.tar.gz
+SHA512 (gr-air-modes-20191111gita2f2627c.tar.gz) = 995889ca79254ca2138da21e844931bd3e3b9a711f0ae2880a955862761f7ecc69f2068e2b801753fdf02532be11ca78dbe817218d9ee18a36a3fde03a075ee3