diff --git a/.gitignore b/.gitignore index 3138232..1271f7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1 @@ -gnuradio-*.tar.gz -/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-*.tar.gz diff --git a/clean_patent_problems.sh b/clean_patent_problems.sh index bfe703b..1ed9ec0 100755 --- a/clean_patent_problems.sh +++ b/clean_patent_problems.sh @@ -10,8 +10,8 @@ PROBLEMS=( 'gr-atsc' ) -# Indicate the source -URL=$(spectool -S -l ./gnuradio.spec | sed -E 's/Source0:\s+//g') +# Indicate the source (including workaround for rhbz#1926687) +URL=$(spectool -S -l ./gnuradio.spec | sed -nE '/^\s*Source/ s/Source0:\s+//g p') # Meta variables SOURCE=$(basename $URL) diff --git a/gnuradio.spec b/gnuradio.spec index eb65f08..5365f9e 100644 --- a/gnuradio.spec +++ b/gnuradio.spec @@ -15,21 +15,25 @@ %endif %endif + +# fmt API change workaround +%global optflags %(echo %{optflags} -DFMT_DEPRECATED_OSTREAM) + # For versions not yet on ftp, pull from git #%%global git_commit 441a3767e05d15e62c519ea66b848b5adb0f4b3a #%%global alphatag rc1 Name: gnuradio -Version: 3.8.0.0 -Release: 7%{?alphatag:.%{alphatag}}%{?dist} +Version: 3.10.12.0 +Release: 11%{?alphatag:.%{alphatag}}%{?dist} Summary: Software defined radio framework -License: GPLv3 +License: GPL-3.0-or-later 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: https://github.com/gnuradio/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source0: https://github.com/gnuradio/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz # git clone git://gnuradio.org/gnuradio # cd gnuradio # git archive --format=tar --prefix=%%{name}-%%{version}/ %%{git_commit} | \ @@ -53,17 +57,11 @@ 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 -BuildRequires: orc-devel BuildRequires: portaudio-devel +BuildRequires: gobject-introspection BuildRequires: python3-devel BuildRequires: python3-cairo -BuildRequires: python3-cheetah -BuildRequires: python3-click-plugins +BuildRequires: python3-click BuildRequires: python3-gobject BuildRequires: python3-numpy BuildRequires: python3-pyyaml @@ -71,32 +69,45 @@ BuildRequires: python3-lxml BuildRequires: python3-mako BuildRequires: python3-qt5-devel BuildRequires: python3-scipy -BuildRequires: python3-six -BuildRequires: python3-sphinx BuildRequires: python3-thrift +BuildRequires: python3-zmq +BuildRequires: python3-jsonschema BuildRequires: qwt-qt5-devel -#BuildRequires: tex(latex) +BuildRequires: tex(latex) BuildRequires: SDL-devel -BuildRequires: swig BuildRequires: thrift BuildRequires: uhd-devel BuildRequires: xdg-utils BuildRequires: xmlto BuildRequires: zeromq-devel BuildRequires: python3-gobject +BuildRequires: pybind11-devel +BuildRequires: volk-devel +BuildRequires: libsndfile-devel +BuildRequires: SoapySDR-devel +BuildRequires: spdlog-devel +BuildRequires: libiio-devel +BuildRequires: libad9361-iio-devel +# for pygccxml +#BuildRequires: castxml Requires: python3-%{name} = %{version}-%{release} Requires: python3-numpy -Requires: python3-cheetah Requires: python3-thrift %if ! 0%{?rhel} Requires: python3-pyopengl %endif Requires: python3-pyyaml Requires: python3-gobject -Requires: python3-six Requires: python3-mako +Requires: python3-click +Requires: python3-qt5 +Requires: python3-scipy +Requires: python3-pyqtgraph +Requires: python3-zmq +Requires: python3-jsonschema Requires: gtk3 +Suggests: soapy-rtlsdr %description GNU Radio is a collection of software that when combined with minimal @@ -135,29 +146,46 @@ Requires: %{name} = %{version}-%{release} GNU Radio examples %prep -%setup -q -n %{name}-%{version}%{?alphatag} +%autosetup -p1 -n %{name}-%{version}%{?alphatag} %build -mkdir build -cd build +# this could be dropped when f32 get retired (not counting EPEL) +%undefine __cmake_in_source_build + +# -DLIB_SUFFIX workaround due to: +# https://github.com/gnuradio/gnuradio/issues/7766 +# https://bugzilla.redhat.com/show_bug.cgi?id=2351130 %cmake \ -DSYSCONFDIR=%{_sysconfdir} \ -DGR_PKG_DOC_DIR=%{_docdir}/%{name} \ -DGR_PYTHON_DIR=%{python3_sitearch} \ -DPYTHON_EXECUTABLE=%{__python3} \ %{?mfpu_neon} \ -.. +%if "%{?_lib}"=="lib64" +-DLIB_SUFFIX=64 +%endif #-DENABLE_DOXYGEN=FALSE \ -%make_build CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing" +%cmake_build %install -%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 - +%cmake_install + +# desktop file +desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ + grc/scripts/freedesktop/gnuradio-grc.desktop +# mime +install -Dpm 0644 grc/scripts/freedesktop/gnuradio-grc.xml \ + %{buildroot}%{_datadir}/mime/packages/gnuradio-grc.xml +# metainfo +install -Dpm 0644 grc/scripts/freedesktop/org.gnuradio.grc.metainfo.xml \ + %{buildroot}%{_datadir}/metainfo/org.gnuradio.grc.metainfo.xml +# icons +for i in 16 24 32 48 64 128 256 +do + install -Dpm 0644 grc/scripts/freedesktop/grc-icon-${i}.png \ + %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/gnuradio-grc.png +done %ldconfig_scriptlets @@ -165,11 +193,12 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %license COPYING %{_bindir}/* %{_libdir}/lib*.so.* -%{_libexecdir}/* %{_datadir}/gnuradio %{_datadir}/applications/gnuradio-grc.desktop %{_datadir}/mime/packages/gnuradio-grc.xml %{_datadir}/icons/hicolor/*/apps/gnuradio-grc.png +%{_datadir}/metainfo/org.gnuradio.grc.metainfo.xml +%{_mandir}/man1/* %config(noreplace) %{_sysconfdir}/gnuradio %exclude %{_datadir}/gnuradio/examples %exclude %{_docdir}/%{name}/html @@ -179,13 +208,14 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %files -n python3-%{name} %{python3_sitearch}/%{name}/ %{python3_sitearch}/pmt/ -%{python3_sitearch}/volk_modtool/ +%{_datadir}/bash-completion/completions/gr_modtool +%{_datadir}/fish/vendor_completions.d/gr_modtool.fish +%{_datadir}/zsh/site-functions/_gr_modtool %files devel %{_includedir}/* %{_libdir}/lib*.so %{_libdir}/pkgconfig/*.pc -%{_libdir}/cmake/volk %{_libdir}/cmake/gnuradio %files doc @@ -196,6 +226,319 @@ rm -r %{buildroot}%{_datadir}/icons/gnome %{_datadir}/gnuradio/examples %changelog +* Tue Jan 13 2026 Jonathan Wakely - 3.10.12.0-11 +- Rebuilt for Boost 1.90 + +* Sat Jan 03 2026 Jaroslav Škarvada - 3.10.12.0-10 +- Fixed build of gnuradio-companion + Resolves: rhbz#2424093 + +* Wed Nov 12 2025 Jaroslav Škarvada - 3.10.12.0-9 +- Enabled iio + +* Fri Sep 19 2025 Python Maint - 3.10.12.0-8 +- Rebuilt for Python 3.14.0rc3 bytecode + +* Thu Sep 11 2025 Jaroslav Škarvada - 3.10.12.0-7 +- Rebuilt for new uhd + +* Fri Aug 15 2025 Python Maint - 3.10.12.0-6 +- Rebuilt for Python 3.14.0rc2 bytecode + +* Wed Jul 23 2025 Fedora Release Engineering - 3.10.12.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed Jun 04 2025 Python Maint - 3.10.12.0-4 +- Rebuilt for Python 3.14 + +* Mon Mar 17 2025 Jaroslav Škarvada - 3.10.12.0-3 +- Rebuilt for new uhd + +* Mon Mar 10 2025 Jaroslav Škarvada - 3.10.12.0-2 +- Rebuild for new volk + +* Thu Feb 20 2025 Marcus Müller - 3.10.12.0-1 +- New version +- Corrected stated license to actually be GPLv3 (or later) +- Remove unused python3-click-plugins dependency (GNU Radio now only needs python3-click) +- Add python3-jsonschema dependency, needed for JSON configuration blocks +- Include the shell completion scripts for gr_modtool in the installed files + +* Sun Feb 02 2025 Orion Poplawski - 3.10.11.0-6 +- Rebuild with gsl 2.8 + +* Thu Jan 16 2025 Fedora Release Engineering - 3.10.11.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Nov 28 2024 Jaroslav Škarvada - 3.10.11.0-4 +- Rebuilt for new spdlog + +* Tue Nov 26 2024 František Zatloukal - 3.10.11.0-3 +- Rebuilt for spdlog 1.15.0 + +* Mon Sep 23 2024 Jaroslav Škarvada - 3.10.11.0-2 +- Fixed icon mode, dropped the executable bit + Resolves: rhbz#2312386 + +* Mon Jul 29 2024 Miroslav Suchý - 3.10.11.0-1.1 +- convert license to SPDX + +* Fri Jul 26 2024 Jaroslav Škarvada - 3.10.11.0-1 +- New version + Resolves: rhbz#2297835 + +* Thu Jul 18 2024 Fedora Release Engineering - 3.10.10.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jul 15 2024 Jaroslav Škarvada - 3.10.10.0-4 +- Rebuilt for new uhd + +* Sun Jun 09 2024 Python Maint - 3.10.10.0-3 +- Rebuilt for Python 3.13 + +* Tue May 21 2024 František Zatloukal - 3.10.10.0-2 +- Rebuilt for spdlog 1.14.1 + +* Thu Apr 25 2024 Jaroslav Škarvada - 3.10.10.0-1 +- New version + Resolves: rhbz#2273782 + +* Thu Feb 1 2024 Jaroslav Škarvada - 3.10.9.2-2 +- Added python3-zmq requirement + Resolves: rhbz#2262173 + +* Mon Jan 22 2024 Jaroslav Škarvada - 3.10.9.2-1 +- New version + Resolves: rhbz#2258885 + +* Fri Jan 19 2024 Fedora Release Engineering - 3.10.9.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 18 2024 Jonathan Wakely - 3.10.9.1-2 +- Rebuilt for Boost 1.83 + +* Tue Jan 2 2024 Jaroslav Škarvada - 3.10.9.1-1 +- New version + Resolves: rhbz#2255186 + +* Mon Dec 11 2023 Jaroslav Škarvada - 3.10.6.0-12 +- Rebuilt for new volk + +* Tue Nov 21 2023 Jaroslav Škarvada - 3.10.6.0-11 +- Rebuilt for new uhd + +* Mon Sep 25 2023 Jaroslav Škarvada - 3.10.6.0-10 +- Rebuilt for new uhd + +* Sat Aug 05 2023 Richard Shaw - 3.10.6.0-9 +- Rebuild for codec2. + +* Wed Jul 19 2023 Fedora Release Engineering - 3.10.6.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Jaroslav Škarvada - 3.10.6.0-7 +- Rebuilt for new python + +* Sat Jul 08 2023 Vitaly Zaitsev - 3.10.6.0-6 +- Rebuilt due to spdlog 1.12 update. + +* Sat Jul 01 2023 Python Maint - 3.10.6.0-5 +- Rebuilt for Python 3.12 + +* Wed Jun 28 2023 Mamoru TASAKA - 3.10.6.0-4 +- Patch for fmt10 for not accepting enum by default + +* Wed Jun 28 2023 Vitaly Zaitsev - 3.10.6.0-3 +- Rebuilt due to fmt 10 update. + +* Fri Jun 16 2023 Python Maint - 3.10.6.0-2 +- Rebuilt for Python 3.12 + +* Mon Jun 5 2023 Jaroslav Škarvada - 3.10.6.0-1 +- New version + +* Mon Feb 20 2023 Jonathan Wakely - 3.10.4.0-7 +- Rebuilt for Boost 1.81 + +* Wed Feb 1 2023 Jaroslav Škarvada - 3.10.4.0-6 +- Rebuilt for new uhd + +* Thu Jan 19 2023 Jaroslav Škarvada - 3.10.4.0-5 +- Rebuilt for new volk + +* Thu Jan 19 2023 Fedora Release Engineering - 3.10.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Dec 21 2022 Sandro Mani - 3.10.4.0-3 +- Rebuild (qwt) + +* Thu Nov 03 2022 Vitaly Zaitsev - 3.10.4.0-2 +- Rebuilt due to spdlog update. + +* Sat Sep 24 2022 Jaroslav Škarvada - 3.10.4.0-1 +- New version + Resolves: rhbz#2127514 + +* Tue Aug 23 2022 Mamoru TASAKA - 3.10.3.0-5 +- Rebuild for gsl-2.7.1 + +* Sat Jul 30 2022 Jaroslav Škarvada - 3.10.3.0-4 +- Rebuilt for new uhd + +* Thu Jul 21 2022 Fedora Release Engineering - 3.10.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jul 09 2022 Richard Shaw - 3.10.3.0-2 +- Rebuild for codec2 1.0.4. + +* Tue Jun 21 2022 Jaroslav Škarvada - 3.10.3.0-1 +- New version + Resolves: rhbz#2099614 + +* Mon Jun 20 2022 Jaroslav Škarvada - 3.10.2.0-4 +- Rebuilt for new python + Resolves: rhbz#2098711 + +* Wed May 04 2022 Thomas Rodgers - 3.10.2.0-3 +- Rebuilt for Boost 1.78 + +* Mon Apr 25 2022 Jaroslav Škarvada - 3.10.2.0-2 +- Rebuilt for new uhd + Resolves: rhbz#2077801 + +* Tue Apr 12 2022 Jaroslav Škarvada - 3.10.2.0-1 +- New version + Resolves: rhbz#2073766 + +* Tue Feb 22 2022 Jaroslav Škarvada - 3.10.1.1-1 +- New version + Resolves: rhbz#2049503 + +* Sun Jan 30 2022 Jaroslav Škarvada - 3.10.1.0-1 +- New version + Resolves: rhbz#2048110 + +* Thu Jan 20 2022 Jaroslav Škarvada - 3.10.0.0-1 +- New version + Resolves: rhbz#2040787 + +* Thu Jan 20 2022 Fedora Release Engineering - 3.9.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Jan 10 2022 Jaroslav Škarvada - 3.9.5.0-1 +- New version + Resolves: rhbz#2038703 + +* Wed Dec 15 2021 Jaroslav Škarvada - 3.9.4.0-3 +- Added missing runtime dependencies + Related: rhbz#2032668 + +* Sun Dec 05 2021 Richard Shaw - 3.9.4.0-2 +- Rebuild for codec2 1.0.1. + +* Mon Nov 1 2021 Jaroslav Škarvada - 3.9.4.0-1 +- New version + Resolves: rhbz#2018818 + +* Wed Oct 20 2021 Jaroslav Škarvada - 3.9.3.0-3 +- Synced gtk-init patch with the upstream +- Added requirement for the python3-qt5 + Resolves: rhbz#2015642 + +* Tue Oct 19 2021 Jaroslav Škarvada - 3.9.3.0-2 +- Fixed gnuradio-companion traceback on gtk init + Resolves: rhbz#2014797 + +* Tue Oct 5 2021 Jaroslav Škarvada - 3.9.3.0-1 +- New version + Resolves: rhbz#2009572 + +* Tue Aug 24 2021 Jaroslav Škarvada - 3.9.2.0-7 +- Rebuilt for new soapy and codec2 + +* Mon Aug 23 2021 Richard Shaw - 3.9.2.0-6 +- Rebuild for codec2 1.0. + +* Sat Aug 07 2021 Jonathan Wakely - 3.9.2.0-5 +- Rebuilt for Boost 1.76 + +* Thu Jul 22 2021 Fedora Release Engineering - 3.9.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jul 2 2021 Jaroslav Škarvada - 3.9.2.0-3 +- Rebuilt for new uhd + +* Sat Jun 12 2021 Jaroslav Škarvada - 3.9.2.0-2 +- Enabled Soapy support + +* Fri Jun 11 2021 Jaroslav Škarvada - 3.9.2.0-1 +- New version + Resolves: rhbz#1970659 + +* Fri Jun 04 2021 Python Maint - 3.9.1.0-3 +- Rebuilt for Python 3.10 + +* Mon May 10 2021 Jonathan Wakely - 3.9.1.0-2 +- Rebuilt for removed libstdc++ symbols (#1937698) + +* Tue Mar 23 2021 Jaroslav Škarvada - 3.9.1.0-1 +- New version + Resolves: rhbz#1941867 + +* Wed Feb 17 2021 Jaroslav Škarvada - 3.9.0.0-5 +- Built with libsndfile + +* Wed Feb 3 2021 Jaroslav Škarvada - 3.9.0.0-4 +- Fixed FTBFS + Resolves: rhbz#1919794 + Resolves: rhbz#1921503 + +* Tue Jan 26 2021 Fedora Release Engineering - 3.9.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jan 22 2021 Jonathan Wakely - 3.9.0.0-2 +- Rebuilt for Boost 1.75 + +* Mon Jan 18 2021 Jaroslav Škarvada - 3.9.0.0-1 +- New version + Resolves: rhbz#1917167 + +* Mon Nov 30 2020 Dan Horák - 3.8.2.0-3 +- use GMP exclusively + +* Tue Aug 25 2020 Jaroslav Škarvada - 3.8.2.0-2 +- Explicitly disabled in-source build + +* Mon Aug 24 2020 Jaroslav Škarvada - 3.8.2.0-1 +- New version + Resolves: rhbz#1871259 + +* Tue Aug 4 2020 Jaroslav Škarvada - 3.8.1.0-7 +- Fixed FTBFS due to cmake changes + Resolves: rhbz#1863736 + +* Sat Aug 01 2020 Fedora Release Engineering - 3.8.1.0-6 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 3.8.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jun 03 2020 Jonathan Wakely - 3.8.1.0-4 +- Rebuilt and patched for Boost 1.73.0 + +* Tue May 26 2020 Miro Hrončok - 3.8.1.0-3 +- Rebuilt for Python 3.9 + +* Mon May 4 2020 Jaroslav Škarvada - 3.8.1.0-2 +- Rebuilt for new codec2 + Resolves: rhbz#1830672 + +* Tue Apr 14 2020 Jaroslav Škarvada - 3.8.1.0-1 +- New version + Resolves: rhbz#1822797 + Resolves: rhbz#1822842 + * Tue Mar 24 2020 Jaroslav Škarvada - 3.8.0.0-7 - Added requirement on python3-six and python3-mako diff --git a/sources b/sources index ceb665e..b720dda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnuradio-3.8.0.0.tar.xz) = 1dc427bf679b9287bc02be38aa9048ed471436d6d21090e91ed48ab62f724c1842f37c6e7843b9ef0e89d9945de88b1b481925f5a9bf73f0251cad4a1773142d +SHA512 (gnuradio-3.10.12.0.tar.gz) = c69605f5df4a2a812ff88bcb26f70ae48dca996fdac0d3c4ce855a4706e751a06bcb1680ec05f6ce07f4206bc06885539f3f74f381b2302aa9e5ae068a7dc804