Hello community, here is the log from the commit of package uhd for openSUSE:Factory checked in at 2020-09-25 16:31:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uhd (Old) and /work/SRC/openSUSE:Factory/.uhd.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "uhd" Fri Sep 25 16:31:28 2020 rev:27 rq:834808 version:4.0.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/uhd/uhd.changes 2020-02-04 19:54:18.233354866 +0100 +++ /work/SRC/openSUSE:Factory/.uhd.new.4249/uhd.changes 2020-09-25 16:32:00.479915603 +0200 @@ -1,0 +2,15 @@ +Tue Sep 15 07:39:46 UTC 2020 - Martin Hauke <mar...@gmx.de> + +- Update to version 4.0.0.0 + See: https://github.com/EttusResearch/uhd/releases for all changes +- Use github source URLs +- Fix URL +- Switch to python3 +- Disable tests for now since compilation of the test programs fail + with recent comilers / boost versions. +- Remove not longer needed patches: + * fix-for-armv6l-armv7l-build-failure.patch + * uhd-fix-for-boost-1_66.patch + * uhd-fix-for-boost-1_67.patch + +------------------------------------------------------------------- Old: ---- fix-for-armv6l-armv7l-build-failure.patch uhd-fix-for-boost-1_66.patch uhd-fix-for-boost-1_67.patch uhd-images_003.009.007-release.tar.xz uhd_3.9.7-release.tar.gz New: ---- uhd-4.0.0.0.tar.gz uhd-images_4.0.0.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uhd.spec ++++++ --- /var/tmp/diff_new_pack.jy8nFs/_old 2020-09-25 16:32:02.587917474 +0200 +++ /var/tmp/diff_new_pack.jy8nFs/_new 2020-09-25 16:32:02.591917477 +0200 @@ -16,36 +16,16 @@ # +%define libname libuhd4_0_0 Name: uhd -%define libname libuhd003 -Version: 3.9.7 +Version: 4.0.0.0 Release: 0 -%define src_ver 003.009.007 -%define img_ver 003.009.007 Summary: The driver for USRP SDR boards License: GPL-3.0-or-later Group: Hardware/Other -URL: http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki -Source0: http://files.ettus.com/binaries/uhd_stable/uhd_%{src_ver}-release/uhd_%{version}-release.tar.gz -Source1: http://files.ettus.com/binaries/images/uhd-images_%{img_ver}-release.tar.xz -# PATCH-FIX-OPENSUSE fix-for-armv6l-armv7l-build-failure.patch -Patch0: fix-for-armv6l-armv7l-build-failure.patch -# PATCH-FIX-OPENSUSE uhd-fix-for-boost-1_66.patch -Patch1: uhd-fix-for-boost-1_66.patch -Patch2: uhd-fix-for-boost-1_67.patch -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_filesystem-devel -BuildRequires: libboost_program_options-devel -BuildRequires: libboost_regex-devel -BuildRequires: libboost_serialization-devel -BuildRequires: libboost_system-devel -BuildRequires: libboost_test-devel -BuildRequires: libboost_thread-devel -# WORKAROUND: force docutils to use python 2 -BuildRequires: python2-docutils -%else -BuildRequires: boost-devel >= 1.36.0 -%endif +URL: https://files.ettus.com/manual/ +Source0: https://github.com/EttusResearch/uhd/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source1: https://github.com/EttusResearch/uhd/releases/download/v%{version}/uhd-images_%{version}.tar.xz BuildRequires: cmake >= 2.6 BuildRequires: docutils BuildRequires: doxygen @@ -54,15 +34,23 @@ BuildRequires: gpsd-devel BuildRequires: memory-constraints BuildRequires: orc -BuildRequires: pkg-config -BuildRequires: python-Mako >= 0.4 -BuildRequires: python-cheetah >= 2.0.0 -BuildRequires: python-devel >= 2.6 +BuildRequires: pkgconfig +BuildRequires: python3-Mako >= 0.4.2 BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(udev) Requires: udev -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_program_options-devel +BuildRequires: libboost_regex-devel +BuildRequires: libboost_serialization-devel +BuildRequires: libboost_system-devel +BuildRequires: libboost_test-devel +BuildRequires: libboost_thread-devel +%else +BuildRequires: boost-devel >= 1.36.0 +%endif %description The UHD is the "Universal Software Radio Peripheral" hardware driver. @@ -99,6 +87,7 @@ Summary: Development files for uhd Group: Development/Libraries/Other Requires: %{libname} = %{version} +Recommends: %{name}-doc %if 0%{?suse_version} > 1325 Requires: libboost_filesystem-devel Requires: libboost_program_options-devel @@ -109,7 +98,6 @@ %else Requires: boost-devel %endif -Recommends: %{name}-doc %description devel The UHD is the "Universal Software Radio Peripheral" hardware driver. @@ -138,26 +126,29 @@ This package contains binary firmware images for the Universal Hardware Driver (UHD). %prep -%setup -q -n %{name}_%{version}-release -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - +%setup -q +# fix python shebangs +find . -type f -name "*.py" -exec sed -i '/^#!/ s|.*|#!%{_bindir}/python3|' {} \; # remove buildtime from documentation -echo "HTML_TIMESTAMP = NO" >> docs/Doxyfile.in +echo "HTML_TIMESTAMP = NO" >> host/docs/Doxyfile.in %build -touch ../README.md %limit_build +cd host %cmake \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - -DENABLE_GPSD=0 + -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ + -DENABLE_TESTS=OFF \ + -DENABLE_GPSD=OFF %make_jobs %check -%ctest +# Do not run check for now - compilation of tests programs is broken: +# See: https://github.com/EttusResearch/uhd/issues/267 +#cd host +#%%ctest %install +cd host %cmake_install # Fix udev rules and allow access only to users in usrp group @@ -165,28 +156,28 @@ install -m 0644 -D %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules %{buildroot}%{_udevrulesdir}/10-usrp-uhd.rules rm %{buildroot}%{_libdir}/uhd/utils/uhd-usrp.rules -# Move documentation at the default docdir +## Move documentation at the default docdir mkdir -p %{buildroot}%{_docdir}/uhd mv %{buildroot}%{_datadir}/doc/uhd %{buildroot}%{_docdir}/ mv %{buildroot}%{_libdir}/uhd/utils/*[!.rules] %{buildroot}%{_bindir} mv %{buildroot}%{_libdir}/uhd/examples/* %{buildroot}%{_bindir} -mv %{buildroot}%{_libdir}/uhd/tests/*_test %{buildroot}%{_bindir} - -rm -rf %{buildroot}%{_libdir}/uhd/tests -rm -rf %{buildroot}%{_libdir}/uhd/examples - -rm -rf %{buildroot}%{_docdir}/uhd/LICENSE -rm -rf %{buildroot}%{_docdir}/uhd/README.md - -# two executable files are installed to /usr/share/uhd -mv %{buildroot}%{_libdir}/uhd/utils/query_gpsdo_sensors %{buildroot}%{_bindir} -mv %{buildroot}%{_libdir}/uhd/utils/usrp_n2xx_simple_net_burner %{buildroot}%{_bindir} +#mv %%{buildroot}%%{_libdir}/uhd/tests/*_test %%{buildroot}%%{_bindir} +# +#rm -R %%{buildroot}%%{_libdir}/uhd/tests +#rm -R %%{buildroot}%%{_libdir}/uhd/examples +# +rm %{buildroot}%{_docdir}/uhd/LICENSE +rm %{buildroot}%{_docdir}/uhd/README.md +# +## two executable files are installed to /usr/share/uhd mv %{buildroot}%{_libdir}/uhd/utils/b2xx_fx3_utils %{buildroot}%{_bindir} -mv %{buildroot}%{_libdir}/uhd/utils/usrp_x3xx_fpga_burner %{buildroot}%{_bindir} +mv %{buildroot}%{_libdir}/uhd/utils/query_gpsdo_sensors %{buildroot}%{_bindir} -# extract firmware -mkdir -p %{buildroot}%{_datadir}/uhd -tar -xJvf %{SOURCE1} --transform="s,^uhd-images_%{img_ver}-release/share/uhd/,," --show-transformed-names -C %{buildroot}%{_datadir}/uhd +# +## extract firmware +mkdir -p %{buildroot}%{_datadir}/uhd/images +tar -xxvf %{SOURCE1} --transform="s,^uhd-images_%{version}/,," --show-transformed-names -C %{buildroot}%{_datadir}/uhd/images/ +rm -R %{buildroot}%{_datadir}/uhd/images/winusb_driver/ # find dupes %fdupes -s %{buildroot}%{_prefix} @@ -198,36 +189,32 @@ %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} -%defattr(-,root,root) -%doc LICENSE -%{_libdir}/*.so.*.* +%license host/LICENSE +%doc host/README.md +%{_libdir}/libuhd.so.* %files udev -%defattr(-,root,root) %{_udevrulesdir}/10-usrp-uhd.rules %files devel -%defattr(-,root,root) %dir %{_includedir}/uhd %dir %{_datadir}/uhd %exclude %{_datadir}/uhd/images +%{_datadir}/uhd/cal +%{_datadir}/uhd/rfnoc %{_includedir}/uhd/* %{_includedir}/uhd.h %{_bindir}/* %{_libdir}/libuhd.so -%{_libdir}/libuhd.so.003 %{_libdir}/pkgconfig/uhd.pc %{_libdir}/cmake/uhd %{_mandir}/man1/* %files firmware -%defattr(-,root,root) %{_datadir}/uhd/images/ %files doc -%defattr(-,root,root) %dir %{_docdir}/uhd %{_docdir}/uhd/doxygen -#{_docdir}/uhd/manual %changelog ++++++ uhd-images_003.009.007-release.tar.xz -> uhd-images_4.0.0.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/uhd/uhd-images_003.009.007-release.tar.xz /work/SRC/openSUSE:Factory/.uhd.new.4249/uhd-images_4.0.0.0.tar.xz differ: char 25, line 1
