| |
@@ -1,3 +1,6 @@
|
| |
+ # For Fedora < 33 and aPEL 8
|
| |
+ %undefine __cmake3_in_source_build
|
| |
+
|
| |
# NEON support is by default enabled on aarch64 and disabled on other ARMs (it can be overridden)
|
| |
%ifarch aarch64
|
| |
%bcond_without neon
|
| |
@@ -22,7 +25,7 @@
|
| |
|
| |
Name: gnuradio
|
| |
Version: 3.8.1.0
|
| |
- Release: 6%{?alphatag:.%{alphatag}}%{?dist}
|
| |
+ Release: 7%{?alphatag:.%{alphatag}}%{?dist}
|
| |
Summary: Software defined radio framework
|
| |
|
| |
License: GPLv3
|
| |
@@ -98,6 +101,7 @@
|
| |
%endif
|
| |
Requires: python3-pyyaml
|
| |
Requires: python3-gobject
|
| |
+ Requires: python3-sip
|
| |
Requires: python3-six
|
| |
Requires: python3-mako
|
| |
Requires: python3-click-plugins
|
| |
@@ -144,21 +148,20 @@
|
| |
%patch0 -p1
|
| |
|
| |
%build
|
| |
- mkdir build
|
| |
- cd build
|
| |
+ export CFLAGS="%{optflags} -fno-strict-aliasing"
|
| |
+ export CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
| |
%cmake \
|
| |
-DSYSCONFDIR=%{_sysconfdir} \
|
| |
-DGR_PKG_DOC_DIR=%{_docdir}/%{name} \
|
| |
-DGR_PYTHON_DIR=%{python3_sitearch} \
|
| |
-DPYTHON_EXECUTABLE=%{__python3} \
|
| |
- %{?mfpu_neon} \
|
| |
- ..
|
| |
+ %{?mfpu_neon}
|
| |
#-DENABLE_DOXYGEN=FALSE \
|
| |
|
| |
- %make_build CFLAGS="%{optflags} -fno-strict-aliasing" CXXFLAGS="%{optflags} -fno-strict-aliasing"
|
| |
+ %cmake_build
|
| |
|
| |
%install
|
| |
- %make_install -C build
|
| |
+ %cmake_install
|
| |
desktop-file-validate %{buildroot}%{_datadir}/applications/gnuradio-grc.desktop
|
| |
# Remove extraneous desktop/icon/mime files
|
| |
rm -r %{buildroot}%{_datadir}/%{name}/grc/freedesktop
|
| |
@@ -201,6 +204,10 @@
|
| |
%{_datadir}/gnuradio/examples
|
| |
|
| |
%changelog
|
| |
+ * Mon Aug 03 2020 Orion Poplawski <orion@nwra.com> - 3.8.1.0-7
|
| |
+ - Use new cmake build macros (FTBFS #1863736)
|
| |
+ - Add requires on python3-sip
|
| |
+
|
| |
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1.0-6
|
| |
- Second attempt - Rebuilt for
|
| |
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
| |
orion
commented 3 years ago
Add requires on python3-sip
This should resolve the current FTBFS. Also, various scripts (e.g. uhd_fft) require the python sip module.