Hello community, here is the log from the commit of package gnuradio for openSUSE:Factory checked in at 2019-09-25 08:24:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnuradio (Old) and /work/SRC/openSUSE:Factory/.gnuradio.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuradio" Wed Sep 25 08:24:24 2019 rev:35 rq:732768 version:3.8.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gnuradio/gnuradio.changes 2019-09-23 12:39:47.865586464 +0200 +++ /work/SRC/openSUSE:Factory/.gnuradio.new.7948/gnuradio.changes 2019-09-25 08:24:26.518416712 +0200 @@ -1,0 +2,9 @@ +Thu Sep 19 21:13:13 UTC 2019 - Stefan Brüns <[email protected]> + +- 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 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnuradio.spec ++++++ --- /var/tmp/diff_new_pack.LQenm1/_old 2019-09-25 08:24:27.594416567 +0200 +++ /var/tmp/diff_new_pack.LQenm1/_new 2019-09-25 08:24:27.594416567 +0200 @@ -72,7 +72,7 @@ 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 @@ 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 @@ %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 @@ 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 @@ %{_docdir}/%{name}/*.grc %files examples -%{_datadir}/gnuradio/examples/ +%dir %{_libdir}/gnuradio +%{_libdir}/gnuradio/examples/ %changelog ++++++ gnuradio-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.LQenm1/_old 2019-09-25 08:24:27.646416560 +0200 +++ /var/tmp/diff_new_pack.LQenm1/_new 2019-09-25 08:24:27.646416560 +0200 @@ -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")
