pool/gnuradio
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 732754 from home:StefanBruens:branches:hardware:sdr

Browse Source 
Fix build failure on Leap 15.x, rpmlint cleanup

OBS-URL: https://build.opensuse.org/request/show/732754
OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/gnuradio?expand=0&rev=74
This commit is contained in:
Dmitry Roshchin 2019-09-23 15:49:33 +00:00 committed by Git OBS Bridge
parent c8a6642d6b
commit fde2fc9a20
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnuradio-rpmlintrc
View File

@ -1,10 +1,2 @@
# Those files are examples - taking for learning...
addFilter("arch-dependent-file-in-usr-share.*/usr/share/gnuradio/examples/audio/.*")
addFilter("arch-dependent-file-in-usr-share.*/usr/share/gnuradio/examples/fcd/.*")
addFilter("arch-dependent-file-in-usr-share.*/usr/share/gnuradio/examples/uhd/.*")
addFilter("arch-dependent-file-in-usr-share.*/usr/share/gnuradio/examples/qt-gui/.*")
addFilter("unstripped-binary-or-object.*/usr/share/gnuradio/examples/audio/.*")
addFilter("unstripped-binary-or-object.*/usr/share/gnuradio/examples/fcd/.*")
addFilter("unstripped-binary-or-object.*/usr/share/gnuradio/examples/uhd/.*")
addFilter("devel-file-in-non-devel-package.*/usr/share/gnuradio/modtool/gr-newmod/include/howto/api.h")
addFilter("devel-file-in-non-devel-package.*/usr/share/gnuradio/modtool/gr-newmod/lib/qa_howto.h")
# Template file for gr_newmod
addFilter("devel-file-in-non-devel-package.*/usr/share/gnuradio/modtool/templates/gr-newmod/include/howto/api.h")

13
gnuradio.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Sep 19 21:13:13 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Use correct QWT dependency, qwt6-devel refers to the Qt4 version on
Leap 15.0/15.1, qwt6-qt5-devel also works for TW.
- Avoid mangled CMakeLists.txt files in gr_modtool template.
- Update rpmlintrc (changed gr_modtool template directory).
- Move arch dependent examples to _libdir, clean rpmlintrc
-------------------------------------------------------------------
Thu Sep 19 16:37:47 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
@ -29,7 +38,7 @@ Thu Sep 12 16:49:33 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+ .clang-format file now dictates coding style
+ clang-format'ed the whole tree.
+ installed CMake files now tell about configuration
* gnuradio-runtime
* gnuradio-runtime
+ reworked fractional tag time handling, especially in the context of resamplers
* GRC
+ C++ generation as option
@ -40,7 +49,7 @@ Thu Sep 12 16:49:33 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+ ROUNDED ARROWS
* gr-qtgui
+ moving from Qt4 to Qt5
* gr-utils
* gr-utils
+ gr_modtool now vastly improved
* gr-vocoder
+ improved versatility

15
gnuradio.spec
View File

@ -72,7 +72,7 @@ BuildRequires: python3-numpy
BuildRequires: python3-pyaml >= 3.11
BuildRequires: python3-qt5-devel
BuildRequires: python3-six
BuildRequires: qwt6-devel
BuildRequires: qwt6-qt5-devel
BuildRequires: swig >= 3.0.8
BuildRequires: uhd-devel
BuildRequires: update-desktop-files
@ -166,6 +166,9 @@ This package contains some examples of using GNU Radio.
sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.in
sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxygen/Doxyfile.swig_doc.in
# protect the template files from %%cmake macro magic / mangling
find gr-utils/python/modtool/templates/gr-newmod -name CMakeLists.txt -exec mv '{}' '{}.tmpl' \;
%build
%limit_build -m 2000
%cmake \
@ -177,6 +180,9 @@ sed -i 's|^HTML_TIMESTAMP = YES|HTML_TIMESTAMP = NO|' docs/doxyg
%cmake_build
%install
# move the template files back
find gr-utils/python/modtool/templates/gr-newmod -name CMakeLists.txt.tmpl -execdir mv '{}' 'CMakeLists.txt' \;
%cmake_install
install -d %{buildroot}%{_docdir}/%{name}
@ -186,6 +192,10 @@ mv %{buildroot}/%{_datadir}/doc/%{name}-*/* %{buildroot}%{_docdir}/%{name}/
install -Dpm 0755 %{SOURCE4} %{buildroot}/%{_bindir}
# Compiled examples are installed as "data", but are arch dependent
install -dm 0755 %{buildroot}%{_libdir}/gnuradio
mv %{buildroot}%{_datadir}/gnuradio/examples %{buildroot}%{_libdir}/gnuradio/
# remove duplicate icons (just keep hicolor)
rm -rf %{buildroot}%{_datadir}/%{name}/grc/freedesktop
rm -rf %{buildroot}%{_datadir}/icons/gnome
@ -239,6 +249,7 @@ rm -rf %{buildroot}%{_datadir}/icons/gnome
%{_docdir}/%{name}/*.grc
%files examples
%{_datadir}/gnuradio/examples/
%dir %{_libdir}/gnuradio
%{_libdir}/gnuradio/examples/
%changelog