From 9991820cb5328aa0ee40c0cb867941ef042b78a7bd781600a247edcdb77455bb Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sun, 18 Aug 2019 16:41:28 +0000 Subject: [PATCH 1/3] Accepting request 724276 from home:wkazubski:test:science Update to release 2019.07 OBS-URL: https://build.opensuse.org/request/show/724276 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=23 --- ad9361.tar.xz | 3 +++ bladeRF-2018.08.tar.xz | 3 --- bladeRF-2019.07.tar.xz | 3 +++ bladeRF.changes | 15 +++++++++++++++ bladeRF.spec | 33 +++++++++++++++++++++++++++------ 5 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 ad9361.tar.xz delete mode 100644 bladeRF-2018.08.tar.xz create mode 100644 bladeRF-2019.07.tar.xz diff --git a/ad9361.tar.xz b/ad9361.tar.xz new file mode 100644 index 0000000..ddb0799 --- /dev/null +++ b/ad9361.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26c9960afebd5508823be6c062caae09533899f6a9e392df86486ade39dc145b +size 4625560 diff --git a/bladeRF-2018.08.tar.xz b/bladeRF-2018.08.tar.xz deleted file mode 100644 index d24cc84..0000000 --- a/bladeRF-2018.08.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6288c230dad26e32236a4b60f0b14c129e6fa0ad91bcf1c40abe8789b352e51f -size 2177625 diff --git a/bladeRF-2019.07.tar.xz b/bladeRF-2019.07.tar.xz new file mode 100644 index 0000000..8a77aa9 --- /dev/null +++ b/bladeRF-2019.07.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5aced31ab512d5e829778f47090333fc1a7734ec964f91ef6027a5fbc80a53eb +size 1424544 diff --git a/bladeRF.changes b/bladeRF.changes index 9d18151..ed4177f 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Aug 17 19:30:59 UTC 2019 - Wojciech Kazubski + +- Update to version 2019.07 + libbladeRF + * Gain mode setting default is now manual + * Tuning mode setting default is now host + * Add OTP command support + * Fix metadata related arithmetic + bladeRF-cli: + * Add RFIC fitler selection + * Add tuning_mode + * Display more useful warning and error messages +- libbladeRF doc files (HTML) in separate package + ------------------------------------------------------------------- Fri Sep 7 12:05:23 UTC 2018 - Martin Pluskal diff --git a/bladeRF.spec b/bladeRF.spec index 13ceca2..a5ee625 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -19,19 +19,20 @@ %define sover 2 %define libname lib%{name}%{sover} -%define libversion 2.0.2 -%define release_name 2018.08 +%define libversion 2.2.1 +%define release_name 2019.07 %define bladerf_group bladerf %define use_syslog 0 Name: bladeRF -Version: 1.4.0 +Version: 1.8.0 Release: 0 Summary: SDR radio receiver License: GPL-2.0-only AND AGPL-3.0-or-later Group: Productivity/Hamradio/Other URL: http://nuand.com/ #Git-Clone: https://github.com/Nuand/bladeRF.git -Source: https://github.com/Nuand/bladeRF/archive/%{release_name}.tar.gz#/%{name}-%{release_name}.tar.xz +Source0: https://github.com/Nuand/bladeRF/archive/%{release_name}.tar.gz#/%{name}-%{release_name}.tar.xz +Source1: ad9361.tar.xz BuildRequires: cmake >= 2.8.4 BuildRequires: doxygen BuildRequires: fdupes @@ -56,6 +57,16 @@ Requires: %{name}-udev %description -n %{libname} Library for bladeRF, SDR transceiver. +%package -n %{libname}-doc +Version: %{libversion} +Release: 0 +Summary: Documentation for libbladeRF +Group: System/Libraries +Requires: %{name}-udev + +%description -n %{libname}-doc +HTML Documentation files for libbladeRF + %package udev Summary: Udev rules for bladeRF Group: Hardware/Other @@ -75,6 +86,10 @@ use of libbladerf. %prep %setup -q -n %{name}-%{release_name} +ls +pushd thirdparty/analogdevicesinc/no-OS +tar -xJf %{SOURCE1} +popd %build cd host @@ -82,7 +97,6 @@ cd host -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ -DUDEV_RULES_PATH=%{_udevrulesdir} \ -DBLADERF_GROUP=%{bladerf_group} \ - -DBUILD_DOCUMENTATION=YES \ %if 0%{?use_syslog} -DENABLE_LIBBLADERF_SYSLOG=ON \ %endif @@ -93,6 +107,10 @@ cd host cd host %cmake_install +#move docs +mkdir -p %{buildroot}%{_docdir} +mv %{buildroot}/%{_datadir}/doc/libbladeRF %{buildroot}%{_docdir} + %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -113,11 +131,14 @@ getent group %{bladerf_group} >/dev/null || groupadd -r %{bladerf_group} %{_mandir}/man1/bladeRF-cli.1%{?ext_man} %files udev -%{_udevrulesdir}/88-nuand.rules +%{_udevrulesdir}/88-nuand-*.rules %files -n %{libname} %{_libdir}/libbladeRF.so.* +%files -n %{libname}-doc +%{_docdir}/libbladeRF + %files devel %{_libdir}/libbladeRF.so %{_includedir}/bladeRF1.h From e6ef7396af1937ab82b8927409415fb7ea7e6b07a8924aba4273cbb680cbc777 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 27 Aug 2019 01:00:17 +0000 Subject: [PATCH 2/3] - Fix download url - Small packaging enhancements OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=24 --- bladeRF-2019.07.tar.xz | 4 ++-- bladeRF.changes | 6 ++++++ bladeRF.spec | 8 ++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bladeRF-2019.07.tar.xz b/bladeRF-2019.07.tar.xz index 8a77aa9..dae48a4 100644 --- a/bladeRF-2019.07.tar.xz +++ b/bladeRF-2019.07.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5aced31ab512d5e829778f47090333fc1a7734ec964f91ef6027a5fbc80a53eb -size 1424544 +oid sha256:87c4ad80c22981cb3571eae222f9c11ba3a1aa18b5276a9cdff088032a24a987 +size 2186702 diff --git a/bladeRF.changes b/bladeRF.changes index ed4177f..28ea996 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 27 00:42:21 UTC 2019 - Martin Pluskal + +- Fix download url +- Small packaging enhancements + ------------------------------------------------------------------- Sat Aug 17 19:30:59 UTC 2019 - Wojciech Kazubski diff --git a/bladeRF.spec b/bladeRF.spec index a5ee625..6177c3b 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -1,7 +1,7 @@ # # spec file for package bladeRF # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2013-2015 Wojciech Kazubski, wk@ire.pw.edu.pl # # All modifications and additions to the file contributed by third parties @@ -29,7 +29,7 @@ Release: 0 Summary: SDR radio receiver License: GPL-2.0-only AND AGPL-3.0-or-later Group: Productivity/Hamradio/Other -URL: http://nuand.com/ +URL: https://nuand.com/ #Git-Clone: https://github.com/Nuand/bladeRF.git Source0: https://github.com/Nuand/bladeRF/archive/%{release_name}.tar.gz#/%{name}-%{release_name}.tar.xz Source1: ad9361.tar.xz @@ -41,6 +41,7 @@ BuildRequires: git-core BuildRequires: help2man BuildRequires: pkgconfig BuildRequires: tecla-devel +BuildRequires: pkgconfig(libedit) BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(udev) @@ -101,7 +102,7 @@ cd host -DENABLE_LIBBLADERF_SYSLOG=ON \ %endif -DBUILD_DOCUMENTATION=ON -%make_jobs +%cmake_build %install cd host @@ -113,7 +114,6 @@ mv %{buildroot}/%{_datadir}/doc/libbladeRF %{buildroot}%{_docdir} %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig - %pre udev getent group %{bladerf_group} >/dev/null || groupadd -r %{bladerf_group} From 0351ac975c9d750d57b2fad2342987c245b4d5d99eb5ab648e0eaf9448da1aa7 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 27 Aug 2019 05:29:28 +0000 Subject: [PATCH 3/3] Accepting request 726299 from home:jengelh:branches:hardware:sdr - Update summaries and RPM category groups. OBS-URL: https://build.opensuse.org/request/show/726299 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=25 --- bladeRF.changes | 5 +++++ bladeRF.spec | 17 ++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/bladeRF.changes b/bladeRF.changes index 28ea996..76922c2 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 27 05:20:04 UTC 2019 - Jan Engelhardt + +- Update summaries and RPM category groups. + ------------------------------------------------------------------- Tue Aug 27 00:42:21 UTC 2019 - Martin Pluskal diff --git a/bladeRF.spec b/bladeRF.spec index 6177c3b..03269a3 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -49,24 +49,23 @@ BuildRequires: pkgconfig(udev) The software for bladeRF USB 3.0 Superspeed Software Defined Radio. %package -n %{libname} +Summary: SDR radio receiver library +Group: System/Libraries Version: %{libversion} Release: 0 -Summary: Library for bladeRF -Group: System/Libraries Requires: %{name}-udev %description -n %{libname} -Library for bladeRF, SDR transceiver. +Library for bladeRF, an SDR transceiver. %package -n %{libname}-doc +Summary: Documentation for libbladeRF +Group: Documentation/HTML Version: %{libversion} Release: 0 -Summary: Documentation for libbladeRF -Group: System/Libraries -Requires: %{name}-udev %description -n %{libname}-doc -HTML Documentation files for libbladeRF +HTML documentation files for libbladeRF. %package udev Summary: Udev rules for bladeRF @@ -74,11 +73,11 @@ Group: Hardware/Other Requires(pre): shadow %description udev -Udev rules for bladeRF +Udev rules for bladeRF. %package devel Summary: Development files for libbladeRF -Group: Development/Libraries/Other +Group: Development/Libraries/C and C++ Requires: %{libname} = %{libversion} %description devel