PR#2: Update to 3.8.0.0 - rpms/gnuradio

rpms / gnuradio

#2 Update to 3.8.0.0

Merged 3 years ago by jskarvad. Opened 3 years ago by orion.

rpms/ orion/gnuradio 3.8 into master

Orion Poplawski • 3 years ago

2a08c0b

.gitignore

file modified

		`@@ -2,3 +2,4 @@`
		`/gnuradio-3.7.13.3.tar.xz`
		`/gnuradio-3.7.13.4.tar.xz`
		`/gnuradio-3.7.13.5.tar.xz`
		`+ /gnuradio-3.8.0.0.tar.xz`

gnuradio-3.7.13.3-size_t.patch

file removed

-394

		`@@ -1,394 +0,0 @@`
		`- diff --git a/docs/doxygen/other/thread_affinity.dox b/docs/doxygen/other/thread_affinity.dox`
		`- index 405477b..dc6ed3e 100644`
		`- --- a/docs/doxygen/other/thread_affinity.dox`
		`- +++ b/docs/doxygen/other/thread_affinity.dox`
		`- @@ -59,7 +59,7 @@ Each block has two new data members:`
		`- A block can set and unset its affinity at any time using the`
		`- following member functions:`
		`-`
		`- -- gr::block::set_processor_affinity(const std::vector<int> &mask)`
		`- +- gr::block::set_processor_affinity(const std::vector<std::size_t> &mask)`
		`- - gr::block::unset_processor_affinity()`
		`-`
		`- Where \p mask is a vector of core numbers to set the thread's affinity`
		`- @@ -85,7 +85,7 @@ to that affinity setting.`
		`- The gr::hier_block2 class supports the same API interface to the block`
		`- thread affinity:`
		`-`
		`- -- gr::hier_block2::set_processor_affinity(const std::vector<int> &mask)`
		`- +- gr::hier_block2::set_processor_affinity(const std::vector<std::size_t> &mask)`
		`- - gr::hier_block2::unset_processor_affinity()`
		`- - gr::hier_block2::processor_affinity()`
		`-`
		`- diff --git a/gnuradio-runtime/include/gnuradio/basic_block.h b/gnuradio-runtime/include/gnuradio/basic_block.h`
		`- index 25d9fb5..2a43a8a 100644`
		`- --- a/gnuradio-runtime/include/gnuradio/basic_block.h`
		`- +++ b/gnuradio-runtime/include/gnuradio/basic_block.h`
		`- @@ -376,13 +376,13 @@ namespace gr {`
		`- d_msg_handlers[which_port] = msg_handler_t(msg_handler);`
		`- }`
		`-`
		`- - virtual void set_processor_affinity(const std::vector<int> &mask)`
		`- + virtual void set_processor_affinity(const std::vector<std::size_t> &mask)`
		`- { throw std::runtime_error("set_processor_affinity not overloaded in child class."); }`
		`-`
		`- virtual void unset_processor_affinity()`
		`- { throw std::runtime_error("unset_processor_affinity not overloaded in child class."); }`
		`-`
		`- - virtual std::vector<int> processor_affinity()`
		`- + virtual std::vector<std::size_t> processor_affinity()`
		`- { throw std::runtime_error("processor_affinity not overloaded in child class."); }`
		`- };`
		`-`
		`- diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h`
		`- index c3de303..bfb7327 100644`
		`- --- a/gnuradio-runtime/include/gnuradio/block.h`
		`- +++ b/gnuradio-runtime/include/gnuradio/block.h`
		`- @@ -621,9 +621,9 @@ namespace gr {`
		`- /*!`
		`- * \brief Set the thread's affinity to processor core \p n.`
		`- *`
		`- - * \param mask a vector of ints of the core numbers available to this block.`
		`- + * \param mask a vector of std::size_t of the core numbers available to this block.`
		`- */`
		`- - void set_processor_affinity(const std::vector<int> &mask);`
		`- + void set_processor_affinity(const std::vector<std::size_t> &mask);`
		`-`
		`- /*!`
		`- * \brief Remove processor affinity to a specific core.`
		`- @@ -633,7 +633,7 @@ namespace gr {`
		`- /*!`
		`- * \brief Get the current processor affinity.`
		`- */`
		`- - std::vector<int> processor_affinity() { return d_affinity; }`
		`- + std::vector<std::size_t> processor_affinity() { return d_affinity; }`
		`-`
		`- /*!`
		`- * \brief Get the current thread priority in use`
		`- @@ -678,7 +678,7 @@ namespace gr {`
		`- int d_max_noutput_items; // value of max_noutput_items for this block`
		`- int d_min_noutput_items;`
		`- tag_propagation_policy_t d_tag_propagation_policy; // policy for moving tags downstream`
		`- - std::vector<int> d_affinity; // thread affinity proc. mask`
		`- + std::vector<std::size_t> d_affinity; // thread affinity proc. mask`
		`- int d_priority; // thread priority level`
		`- bool d_pc_rpc_set;`
		`- bool d_update_rate; // should sched update rel rate?`
		`- diff --git a/gnuradio-runtime/include/gnuradio/block_detail.h b/gnuradio-runtime/include/gnuradio/block_detail.h`
		`- index 8a9f4ab..a0a8f83 100644`
		`- --- a/gnuradio-runtime/include/gnuradio/block_detail.h`
		`- +++ b/gnuradio-runtime/include/gnuradio/block_detail.h`
		`- @@ -181,10 +181,10 @@ namespace gr {`
		`- * \brief Set core affinity of block to the cores in the vector`
		`- * mask.`
		`- *`
		`- - * \param mask a vector of ints of the core numbers available to`
		`- + * \param mask a vector of std::size_t of the core numbers available to`
		`- * this block.`
		`- */`
		`- - void set_processor_affinity(const std::vector<int> &mask);`
		`- + void set_processor_affinity(const std::vector<std::size_t> &mask);`
		`-`
		`- /*!`
		`- * \brief Unset core affinity.`
		`- diff --git a/gnuradio-runtime/include/gnuradio/hier_block2.h b/gnuradio-runtime/include/gnuradio/hier_block2.h`
		`- index 08a5389..d4f9696 100644`
		`- --- a/gnuradio-runtime/include/gnuradio/hier_block2.h`
		`- +++ b/gnuradio-runtime/include/gnuradio/hier_block2.h`
		`- @@ -248,7 +248,7 @@ namespace gr {`
		`- *`
		`- * \param mask a vector of ints of the core numbers available to this block.`
		`- */`
		`- - void set_processor_affinity(const std::vector<int> &mask);`
		`- + void set_processor_affinity(const std::vector<std::size_t> &mask);`
		`-`
		`- /*!`
		`- * \brief Remove processor affinity for all blocks in hier_block2.`
		`- @@ -264,7 +264,7 @@ namespace gr {`
		`- * interface. If any block has been individually set, then this`
		`- * call could be misleading.`
		`- */`
		`- - std::vector<int> processor_affinity();`
		`- + std::vector<std::size_t> processor_affinity();`
		`-`
		`- /*!`
		`- * \brief Get if all block min buffers should be set.`
		`- diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h`
		`- index 3fda5d8..816abd0 100644`
		`- --- a/gnuradio-runtime/include/gnuradio/thread/thread.h`
		`- +++ b/gnuradio-runtime/include/gnuradio/thread/thread.h`
		`- @@ -81,7 +81,7 @@ namespace gr {`
		`- * do support in this way since 10.5 is not what we want or can`
		`- * use in this fashion).`
		`- */`
		`- - GR_RUNTIME_API void thread_bind_to_processor(const std::vector<int> &mask);`
		`- + GR_RUNTIME_API void thread_bind_to_processor(const std::vector<std::size_t> &mask);`
		`-`
		`- /*! \brief Convineince function to bind the current thread to a single core.`
		`- *`
		`- @@ -93,7 +93,7 @@ namespace gr {`
		`- * do support in this way since 10.5 is not what we want or can`
		`- * use in this fashion).`
		`- */`
		`- - GR_RUNTIME_API void thread_bind_to_processor(int n);`
		`- + GR_RUNTIME_API void thread_bind_to_processor(std::size_t n);`
		`-`
		`- /*! \brief Bind a thread to a set of cores.`
		`- *`
		`- @@ -108,7 +108,7 @@ namespace gr {`
		`- * use in this fashion).`
		`- */`
		`- GR_RUNTIME_API void thread_bind_to_processor(gr_thread_t thread,`
		`- - const std::vector<int> &mask);`
		`- + const std::vector<std::size_t> &mask);`
		`-`
		`-`
		`- /*! \brief Convineince function to bind the a thread to a single core.`
		`- diff --git a/gnuradio-runtime/lib/block.cc b/gnuradio-runtime/lib/block.cc`
		`- index 86c4aa7..36c3c99 100644`
		`- --- a/gnuradio-runtime/lib/block.cc`
		`- +++ b/gnuradio-runtime/lib/block.cc`
		`- @@ -327,7 +327,7 @@ namespace gr {`
		`- }`
		`-`
		`- void`
		`- - block::set_processor_affinity(const std::vector<int> &mask)`
		`- + block::set_processor_affinity(const std::vector<std::size_t> &mask)`
		`- {`
		`- d_affinity = mask;`
		`- if(d_detail) {`
		`- diff --git a/gnuradio-runtime/lib/block_detail.cc b/gnuradio-runtime/lib/block_detail.cc`
		`- index 3da150e..972a823 100644`
		`- --- a/gnuradio-runtime/lib/block_detail.cc`
		`- +++ b/gnuradio-runtime/lib/block_detail.cc`
		`- @@ -251,7 +251,7 @@ namespace gr {`
		`- }`
		`-`
		`- void`
		`- - block_detail::set_processor_affinity(const std::vector<int> &mask)`
		`- + block_detail::set_processor_affinity(const std::vector<std::size_t> &mask)`
		`- {`
		`- if(threaded) {`
		`- try {`
		`- diff --git a/gnuradio-runtime/lib/hier_block2.cc b/gnuradio-runtime/lib/hier_block2.cc`
		`- index 597ae03..031ec30 100644`
		`- --- a/gnuradio-runtime/lib/hier_block2.cc`
		`- +++ b/gnuradio-runtime/lib/hier_block2.cc`
		`- @@ -161,7 +161,7 @@ namespace gr {`
		`- }`
		`-`
		`- void`
		`- - hier_block2::set_processor_affinity(const std::vector<int> &mask)`
		`- + hier_block2::set_processor_affinity(const std::vector<std::size_t> &mask)`
		`- {`
		`- d_detail->set_processor_affinity(mask);`
		`- }`
		`- @@ -172,7 +172,7 @@ namespace gr {`
		`- d_detail->unset_processor_affinity();`
		`- }`
		`-`
		`- - std::vector<int>`
		`- + std::vector<std::size_t>`
		`- hier_block2::processor_affinity()`
		`- {`
		`- return d_detail->processor_affinity();`
		`- diff --git a/gnuradio-runtime/lib/hier_block2_detail.cc b/gnuradio-runtime/lib/hier_block2_detail.cc`
		`- index 82a40fe..0ab1bf9 100644`
		`- --- a/gnuradio-runtime/lib/hier_block2_detail.cc`
		`- +++ b/gnuradio-runtime/lib/hier_block2_detail.cc`
		`- @@ -931,7 +931,7 @@ namespace gr {`
		`- }`
		`-`
		`- void`
		`- - hier_block2_detail::set_processor_affinity(const std::vector<int> &mask)`
		`- + hier_block2_detail::set_processor_affinity(const std::vector<std::size_t> &mask)`
		`- {`
		`- basic_block_vector_t tmp = d_fg->calc_used_blocks();`
		`- for(basic_block_viter_t p = tmp.begin(); p != tmp.end(); p++) {`
		`- @@ -948,7 +948,7 @@ namespace gr {`
		`- }`
		`- }`
		`-`
		`- - std::vector<int>`
		`- + std::vector<std::size_t>`
		`- hier_block2_detail::processor_affinity()`
		`- {`
		`- basic_block_vector_t tmp = d_fg->calc_used_blocks();`
		`- diff --git a/gnuradio-runtime/lib/hier_block2_detail.h b/gnuradio-runtime/lib/hier_block2_detail.h`
		`- index a5584fe..0cdb149 100644`
		`- --- a/gnuradio-runtime/lib/hier_block2_detail.h`
		`- +++ b/gnuradio-runtime/lib/hier_block2_detail.h`
		`- @@ -54,9 +54,9 @@ namespace gr {`
		`- void unlock();`
		`- void flatten_aux(flat_flowgraph_sptr sfg) const;`
		`-`
		`- - void set_processor_affinity(const std::vector<int> &mask);`
		`- + void set_processor_affinity(const std::vector<std::size_t> &mask);`
		`- void unset_processor_affinity();`
		`- - std::vector<int> processor_affinity();`
		`- + std::vector<std::size_t> processor_affinity();`
		`-`
		`- // Track output buffer min/max settings`
		`- std::vector<size_t> d_max_output_buffer;`
		`- diff --git a/gnuradio-runtime/lib/thread/thread.cc b/gnuradio-runtime/lib/thread/thread.cc`
		`- index 4db91d4..6a5854c 100644`
		`- --- a/gnuradio-runtime/lib/thread/thread.cc`
		`- +++ b/gnuradio-runtime/lib/thread/thread.cc`
		`- @@ -40,33 +40,33 @@ namespace gr {`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(int n)`
		`- + thread_bind_to_processor(std::size_t n)`
		`- {`
		`- - std::vector<int> mask(1, n);`
		`- + std::vector<std::size_t> mask(1, n);`
		`- thread_bind_to_processor(get_current_thread_id(), mask);`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(const std::vector<int> &mask)`
		`- + thread_bind_to_processor(const std::vector<std::size_t> &mask)`
		`- {`
		`- thread_bind_to_processor(get_current_thread_id(), mask);`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(gr_thread_t thread, int n)`
		`- + thread_bind_to_processor(gr_thread_t thread, std::size_t n)`
		`- {`
		`- - std::vector<int> mask(1, n);`
		`- + std::vector<std::size_t> mask(1, n);`
		`- thread_bind_to_processor(thread, mask);`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(gr_thread_t thread, const std::vector<int> &mask)`
		`- + thread_bind_to_processor(gr_thread_t thread, const std::vector<std::size_t> &mask)`
		`- {`
		`- //DWORD_PTR mask = (1 << n);`
		`- DWORD_PTR dword_mask = 0;`
		`-`
		`- - std::vector<int> _mask = mask;`
		`- - std::vector<int>::iterator itr;`
		`- + std::vector<std::size_t> _mask = mask;`
		`- + std::vector<std::size_t>::iterator itr;`
		`- for(itr = _mask.begin(); itr != _mask.end(); itr++)`
		`- dword_mask \|= (1 << (*itr));`
		`-`
		`- @@ -179,25 +179,25 @@ namespace gr {`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(int n)`
		`- + thread_bind_to_processor(std::size_t n)`
		`- {`
		`- // Not implemented on OSX`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(gr_thread_t thread, int n)`
		`- + thread_bind_to_processor(gr_thread_t thread, std::size_t n)`
		`- {`
		`- // Not implemented on OSX`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(const std::vector<int> &mask)`
		`- + thread_bind_to_processor(const std::vector<std::size_t> &mask)`
		`- {`
		`- // Not implemented on OSX`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(gr_thread_t thread, const std::vector<int> &mask)`
		`- + thread_bind_to_processor(gr_thread_t thread, const std::vector<std::size_t> &mask)`
		`- {`
		`- // Not implemented on OSX`
		`- }`
		`- @@ -262,32 +262,32 @@ namespace gr {`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(int n)`
		`- + thread_bind_to_processor(std::size_t n)`
		`- {`
		`- - std::vector<int> mask(1, n);`
		`- + std::vector<std::size_t> mask(1, n);`
		`- thread_bind_to_processor(get_current_thread_id(), mask);`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(const std::vector<int> &mask)`
		`- + thread_bind_to_processor(const std::vector<std::size_t> &mask)`
		`- {`
		`- thread_bind_to_processor(get_current_thread_id(), mask);`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(gr_thread_t thread, int n)`
		`- + thread_bind_to_processor(gr_thread_t thread, std::size_t n)`
		`- {`
		`- - std::vector<int> mask(1, n);`
		`- + std::vector<std::size_t> mask(1, n);`
		`- thread_bind_to_processor(thread, mask);`
		`- }`
		`-`
		`- void`
		`- - thread_bind_to_processor(gr_thread_t thread, const std::vector<int> &mask)`
		`- + thread_bind_to_processor(gr_thread_t thread, const std::vector<std::size_t> &mask)`
		`- {`
		`- cpu_set_t set;`
		`- size_t len = sizeof(cpu_set_t);`
		`- - std::vector<int> _mask = mask;`
		`- - std::vector<int>::iterator itr;`
		`- + std::vector<std::size_t> _mask = mask;`
		`- + std::vector<std::size_t>::iterator itr;`
		`-`
		`- CPU_ZERO(&set);`
		`- for(itr = _mask.begin(); itr != _mask.end(); itr++)`
		`- diff --git a/gnuradio-runtime/swig/block.i b/gnuradio-runtime/swig/block.i`
		`- index 945cea7..7d2b29e 100644`
		`- --- a/gnuradio-runtime/swig/block.i`
		`- +++ b/gnuradio-runtime/swig/block.i`
		`- @@ -99,9 +99,9 @@ class gr::block : public gr::basic_block`
		`- float pc_throughput_avg();`
		`-`
		`- // Methods to manage processor affinity.`
		`- - void set_processor_affinity(const std::vector<int> &mask);`
		`- + void set_processor_affinity(const std::vector<std::size_t> &mask);`
		`- void unset_processor_affinity();`
		`- - std::vector<int> processor_affinity();`
		`- + std::vector<std::size_t> processor_affinity();`
		`-`
		`- // Methods to manage thread priority`
		`- int active_thread_priority();`
		`- diff --git a/gnuradio-runtime/swig/hier_block2.i b/gnuradio-runtime/swig/hier_block2.i`
		`- index 12190d0..de79e3f 100644`
		`- --- a/gnuradio-runtime/swig/hier_block2.i`
		`- +++ b/gnuradio-runtime/swig/hier_block2.i`
		`- @@ -87,9 +87,9 @@ namespace gr {`
		`- void message_port_register_hier_in(pmt::pmt_t port_id);`
		`- void message_port_register_hier_out(pmt::pmt_t port_id);`
		`-`
		`- - void set_processor_affinity(const std::vector<int> &mask);`
		`- + void set_processor_affinity(const std::vector<std::size_t> &mask);`
		`- void unset_processor_affinity();`
		`- - std::vector<int> processor_affinity();`
		`- + std::vector<std::size_t> processor_affinity();`
		`-`
		`- // Methods to manage block's min/max buffer sizes.`
		`- size_t max_output_buffer(int i);`
		`- diff --git a/gr-blocks/lib/qa_gr_top_block.cc b/gr-blocks/lib/qa_gr_top_block.cc`
		`- index 39709d2..8792637 100644`
		`- --- a/gr-blocks/lib/qa_gr_top_block.cc`
		`- +++ b/gr-blocks/lib/qa_gr_top_block.cc`
		`- @@ -278,7 +278,7 @@ void qa_top_block::t11_set_block_affinity()`
		`- gr::block_sptr src (gr::blocks::null_source::make(sizeof(float)));`
		`- gr::block_sptr snk (gr::blocks::null_sink::make(sizeof(float)));`
		`-`
		`- - std::vector<int> set(1, 0), ret;`
		`- + std::vector<std::size_t> set(1, 0), ret;`
		`- src->set_processor_affinity(set);`
		`-`
		`- tb->connect(src, 0, snk, 0);`

gnuradio.spec

file modified

+87 -88

		`@@ -5,8 +5,6 @@`
		`%bcond_with neon`
		`%endif`

		`- %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}`
		`-`
		`%ifarch %{arm}`
		`%if %{with neon}`
		`%global my_optflags %(echo -n "%{optflags}" \| sed 's/-mfpu=[^ \\t]\\+//g'; echo " -mfpu=neon")`
		`@@ -23,61 +21,74 @@`
		`#%%global alphatag rc1`

		`Name: gnuradio`
		`- Version: 3.7.13.5`
		`- Release: 8%{?alphatag:.%{alphatag}}%{?dist}`
		`+ Version: 3.8.0.0`
		`+ Release: 1%{?alphatag:.%{alphatag}}%{?dist}`
		`Summary: Software defined radio framework`

		`License: GPLv3`
		`- URL: http://www.gnuradio.org`
		`- #Source0: ftp://ftp.gnu.org/gnu/gnuradio/gnuradio-%%{version}.tar.gz`
		`- #Source0: http://gnuradio.org/redmine/attachments/download/%%{attachment_id}/gnuradio-%%{version}.tar.gz`
		`+ URL: https://www.gnuradio.org`
		`#Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}%%{?alphatag}.tar.xz`
		`#Source0: http://gnuradio.org/releases/gnuradio/gnuradio-%%{version}.tar.gz`
		`- Source0: http://github.com/gnuradio/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz`
		`+ Source0: https://github.com/gnuradio/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz`
		`# git clone git://gnuradio.org/gnuradio`
		`# cd gnuradio`
		`# git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} \| \`
		`# gzip > ../%%{name}-%%{version}.tar.gz`

		`Requires(pre): shadow-utils`
		`- BuildRequires: cmake, fftw-devel, cppunit-devel, wxPython-devel, xmlto`
		`- BuildRequires: graphviz, boost-devel, python2-devel, swig, doxygen`
		`- BuildRequires: libusbx-devel, alsa-lib-devel, SDL-devel, guile-devel`
		`- BuildRequires: portaudio-devel, libtool, gsm-devel, python2`
		`- # Gnuradio deprecated gr-comedi`
		`- # http://gnuradio.org/redmine/issues/show/395`
		`- # BuildRequires: comedilib-devel`
		`- BuildRequires: gsl-devel, tex(latex), numpy, PyQt4-devel, python2-cheetah`
		`- BuildRequires: xdg-utils, python2-lxml, pygtk2-devel, orc-devel`
		`- BuildRequires: desktop-file-utils, python2-mako, python2-six`
		`- BuildRequires: uhd-devel, python2, cppzmq-devel, zeromq-devel, thrift`
		`- #BuildRequires: python2-sphinx`
		`- BuildRequires: codec2-devel, findutils`
		`- BuildRequires: comedilib-devel, jack-audio-connection-kit-devel`
		`- #BuildRequires: python3-thrift`
		`-`
		`- # qwt was dropped in fedora 31+, migration to PyQtGraph should be finished in`
		`- # gnuradio-3.8`
		`- # https://github.com/gnuradio/gnuradio/issues/1634`
		`- # https://github.com/gnuradio/gnuradio/pull/2399`
		`- # https://github.com/gnuradio/gnuradio/pull/2187`
		`- %if ! 0%{?rhel:1} && 0%{?fedora} < 31`
		`- BuildRequires: PyQwt-devel, qwt-devel, qwtplot3d-qt4-devel`
		`- %endif`
		`- Requires: numpy, python2-wxpython, scipy, portaudio, python2-lxml`
		`- Requires: pygtk2, python2-cheetah, PyQt4, zeromq, log4cpp-devel`
		`- #Requires: python3-thrift`
		`- %if ! 0%{?rhel:1}`
		`- %if 0%{?fedora} < 31`
		`- Requires: PyQwt`
		`- %endif`
		`- Requires: python2-pyopengl`
		`+ BuildRequires: cmake`
		`+ BuildRequires: gcc-c++`
		`+ BuildRequires: libtool`
		`+ BuildRequires: alsa-lib-devel`
		`+ BuildRequires: boost-devel`
		`+ BuildRequires: codec2-devel`
		`+ BuildRequires: cppzmq-devel`
		`+ BuildRequires: desktop-file-utils`
		`+ BuildRequires: doxygen`
		`+ BuildRequires: fftw-devel`
		`+ BuildRequires: findutils`
		`+ BuildRequires: gmp-devel`
		`+ BuildRequires: graphviz`
		`+ BuildRequires: gsl-devel`
		`+ BuildRequires: gsm-devel`
		`+ BuildRequires: gtk3-devel`
		`+ BuildRequires: jack-audio-connection-kit-devel`
		`+ BuildRequires: log4cpp-devel`
		`+ # mpir is not yet available on ppc64le`
		`+ %ifnarch ppc64le`
		`+ BuildRequires: mpir-devel`
		`%endif`
		`- Obsoletes: usrp < 3.3.0-1`
		`- Obsoletes: grc < 0.80-1`
		`- # rhbz#1143914, patch approved by upstream to be used as distro specific`
		`- # patch, upstream report: http://gnuradio.org/redmine/issues/728`
		`- Patch0: gnuradio-3.7.13.3-size_t.patch`
		`+ BuildRequires: orc-devel`
		`+ BuildRequires: portaudio-devel`
		`+ BuildRequires: python3-devel`
		`+ BuildRequires: python3-cairo`
		`+ BuildRequires: python3-cheetah`
		`+ BuildRequires: python3-click-plugins`
		`+ BuildRequires: python3-gobject`
		`+ BuildRequires: python3-numpy`
		`+ BuildRequires: python3-pyyaml`
		`+ BuildRequires: python3-lxml`
		`+ BuildRequires: python3-mako`
		`+ BuildRequires: python3-qt5-devel`
		`+ BuildRequires: python3-scipy`
		`+ BuildRequires: python3-six`
		`+ BuildRequires: python3-sphinx`
		`+ BuildRequires: python3-thrift`
		`+ BuildRequires: qwt-qt5-devel`
		`+ #BuildRequires: tex(latex)`
		`+ BuildRequires: SDL-devel`
		`+ BuildRequires: swig`
		`+ BuildRequires: thrift`
		`+ BuildRequires: uhd-devel`
		`+ BuildRequires: xdg-utils`
		`+ BuildRequires: xmlto`
		`+ BuildRequires: zeromq-devel`
		`+`
		`+ Requires: python3-%{name} = %{version}-%{release}`
		`+ Requires: python3-numpy`
		`+ Requires: python3-cheetah`
		`+ Requires: python3-thrift`
		`+ Requires: python3-pyopengl`

		`%description`
		`GNU Radio is a collection of software that when combined with minimal`
		`@@ -86,11 +97,17 @@`
		`that it turns the digital modulation schemes used in today's high`
		`performance wireless devices into software problems.`

		`+ %package -n python3-%{name}`
		`+ Summary: GNU Radio Python 3 module`
		`+`
		`+ %description -n python3-%{name}`
		`+ GNU Radio Python 3 module`
		`+`
		`%package devel`
		`Summary: GNU Radio`
		`- Requires: %{name} = %{version}-%{release}`
		`- Requires: cmake, boost-devel`
		`- Obsoletes: usrp-devel < 3.3.0-1`
		`+ Requires: %{name}%{?_isa} = %{version}-%{release}`
		`+ Requires: cmake`
		`+ Requires: boost-devel%{?_isa}`

		`%description devel`
		`GNU Radio Headers`
		`@@ -98,7 +115,6 @@`
		`%package doc`
		`Summary: GNU Radio`
		`Requires: %{name} = %{version}-%{release}`
		`- BuildArch: noarch`

		`%description doc`
		`GNU Radio Documentation`
		`@@ -112,13 +128,6 @@`

		`%prep`
		`%setup -q -n %{name}-%{version}%{?alphatag}`
		`- %patch0 -p1 -b .size_t`
		`-`
		`- # Use cmake's FindGSL.cmake instead`
		`- rm cmake/Modules/FindGSL.cmake`
		`-`
		`- #force regeneration of cached moc output files`
		`- find . -name "*_moc.cc" -exec rm {} \;`

		`%build`
		`mkdir build`
		`@@ -126,48 +135,26 @@`
		`%cmake \`
		`-DSYSCONFDIR=%{_sysconfdir} \`
		`-DGR_PKG_DOC_DIR=%{_docdir}/%{name} \`
		`- -DENABLE_DOXYGEN=FALSE \`
		`+ -DGR_PYTHON_DIR=%{python3_sitearch} \`
		`+ -DPYTHON_EXECUTABLE=%{__python3} \`
		`%{?mfpu_neon} \`
		`..`
		`+ #-DENABLE_DOXYGEN=FALSE \`

		`- make %{?_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"`
		`+ %make_build CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"`

		`%install`
		`- rm -rf %{buildroot}`
		`- pushd build`
		`- make install DESTDIR=%{buildroot}`
		`- popd`
		`-`
		`- # remove atsc example (bytecompilation problem)`
		`- # the examples shouldn't be probably bytecompiled,`
		`- # but selective bytecompilation would take a lot of time,`
		`- # thus letting it as is`
		`- rm -rf %{buildroot}%{_datadir}/%{name}/examples/atsc`
		`-`
		`- # install desktop file, icons, and MIME configuration to right locations`
		`- mkdir -p %{buildroot}%{_datadir}/applications`
		`- desktop-file-install --dir=%{buildroot}%{_datadir}/applications \`
		`- %{buildroot}%{_datadir}/%{name}/grc/freedesktop/gnuradio-grc.desktop`
		`- mkdir -p %{buildroot}%{_datadir}/mime/packages`
		`- mv %{buildroot}%{_datadir}/%{name}/grc/freedesktop/gnuradio-grc.xml %{buildroot}%{_datadir}/mime/packages`
		`- for x in 32 48 64 128 256`
		`- do`
		`- mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${x}x${x}/apps`
		`- mv %{buildroot}%{_datadir}/%{name}/grc/freedesktop/grc-icon-${x}.png %{buildroot}%{_datadir}/icons/hicolor/${x}x${x}/apps/gnuradio-grc.png`
		`- done`
		`- rm -f %{buildroot}%{_datadir}/%{name}/grc/freedesktop/*`
		`- rmdir %{buildroot}%{_datadir}/%{name}/grc/freedesktop`
		`-`
		`- # fix hashbangs`
		`- pushd %{buildroot}%{_bindir}`
		`- sed -i '1 s/^$#!\/usr\/bin\/$$env\\|python$.*$/\1python2/' gr-ctrlport-monitor gr-perf-monitorx`
		`- popd`
		`+ %make_install -C build`
		`+ desktop-file-validate %{buildroot}%{_datadir}/applications/gnuradio-grc.desktop`
		`+ # Remove extraneous desktop/icon/mime files`
		`+ rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop`
		`+ rm -r %{buildroot}%{_datadir}/icons/gnome`
		`+`

		`%ldconfig_scriptlets`

		`%files`
		`%license COPYING`
		`- %{python2_sitearch}/*`
		`%{_bindir}/*`
		`%{_libdir}/lib.so.`
		`%{_libexecdir}/*`
		`@@ -181,6 +168,11 @@`
		`%exclude %{_docdir}/%{name}/xml`
		`%doc %{_docdir}/%{name}`

		`+ %files -n python3-%{name}`
		`+ %{python3_sitearch}/%{name}/`
		`+ %{python3_sitearch}/pmt/`
		`+ %{python3_sitearch}/volk_modtool/`
		`+`
		`%files devel`
		`%{_includedir}/*`
		`%{_libdir}/lib*.so`
		`@@ -196,6 +188,13 @@`
		`%{_datadir}/gnuradio/examples`

		`%changelog`
		`+ * Thu Oct 31 2019 Orion Poplawski <orion@nwra.com> - 3.8.0.0-1`
		`+ - Update to 3.8.0.0`
		`+ - Drop old obsoletes`
		`+ - Split out python modules into separate package`
		`+ - Use https in URLs`
		`+ - Re-enable Doxygen doc build`
		`+`
		`* Mon Aug 26 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 3.7.13.5-8`
		`- Rebuilt for new GSL`

sources

file modified

+1 -1

		`@@ -1,1 +1,1 @@`
		`- SHA512 (gnuradio-3.7.13.5.tar.xz) = fc2991c8e81db4eaa7343a0eb509d412aed0502af9de9edee1aa98a83499f9db7ae8f0005fc3db3d2d223fe107bc7df785e3167aa2187159c58ca5a0b7585834`
		`+ SHA512 (gnuradio-3.8.0.0.tar.xz) = 62b5df54d16b6649c9518f2cf69de8d5bc45a6ea7a64af6676d6b4e58ac7adf6ec0d0b88d1fc993b973d556682b34f25833ecc7771ca9f6a8e985a8b8ee3cef8`

orion commented 3 years ago

Drop old obsoletes
Split out python modules into separate package
Use https in URLs
Re-enable Doxygen doc build

I don't know if the source needs to be sanitized via clean_patent_problems.sh - there are no comments about it in the spec file.

Some more concerning rpmlint messages:

gnuradio-examples.x86_64: E: arch-dependent-file-in-usr-share /usr/share/gnuradio/examples/audio/dial_tone
gnuradio-examples.x86_64: E: arch-dependent-file-in-usr-share /usr/share/gnuradio/examples/qt-gui/display_qt
gnuradio-examples.x86_64: E: arch-dependent-file-in-usr-share /usr/share/gnuradio/examples/uhd/tags_demo
gnuradio.x86_64: E: non-executable-script /usr/share/gnuradio/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/compound.py 644 /usr/bin/env python
gnuradio.x86_64: E: non-executable-script /usr/share/gnuradio/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/compoundsuper.py 644 /usr/bin/env python
gnuradio.x86_64: E: non-executable-script /usr/share/gnuradio/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/index.py 644 /usr/bin/env python
gnuradio.x86_64: E: non-executable-script /usr/share/gnuradio/modtool/templates/gr-newmod/docs/doxygen/doxyxml/generated/indexsuper.py 644 /usr/bin/env python