From 05f41fda8f5493a528e034d223e745d9b2c84f36af5cd7bda6faca02f371488b Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 15 Apr 2017 20:42:35 +0000 Subject: [PATCH 1/6] Accepting request 488112 from home:mnhauke:sdr-devel - Adjust Source-URL - Use proper cmake options - Use group bladerf in the udev-rules OBS-URL: https://build.opensuse.org/request/show/488112 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=8 --- 2016.06.tar.gz => bladeRF-2016.06.tar.xz | 0 bladeRF.changes | 7 +++++ bladeRF.spec | 38 ++++++++++++++++-------- 3 files changed, 32 insertions(+), 13 deletions(-) rename 2016.06.tar.gz => bladeRF-2016.06.tar.xz (100%) diff --git a/2016.06.tar.gz b/bladeRF-2016.06.tar.xz similarity index 100% rename from 2016.06.tar.gz rename to bladeRF-2016.06.tar.xz diff --git a/bladeRF.changes b/bladeRF.changes index bb868cb..cffc0a5 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Apr 15 17:12:59 UTC 2017 - mardnh@gmx.de + +- Adjust Source-URL +- Use proper cmake options +- Use group bladerf in the udev-rules + ------------------------------------------------------------------- Thu Mar 30 13:35:57 UTC 2017 - wk@ire.pw.edu.pl diff --git a/bladeRF.spec b/bladeRF.spec index 3bd0bfa..2a0d8d1 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -20,6 +20,8 @@ %define sover 1 %define libname lib%{name}%{sover} %define release_name 2016.06 +%define bladerf_group bladerf +%define use_syslog 0 Name: bladeRF Version: 1.4.0 Release: 0 @@ -27,7 +29,8 @@ Summary: SDR radio receiver License: GPL-2.0 Group: Productivity/Hamradio/Other Url: http://nuand.com/ -Source: https://github.com/Nuand/bladeRF/archive/%{release_name}.tar.gz +#Git-Clone: https://github.com/Nuand/bladeRF.git +Source: https://github.com/Nuand/bladeRF/archive/%{release_name}.tar.gz#/%{name}-%{release_name}.tar.xz BuildRequires: cmake >= 2.8.4 BuildRequires: doxygen BuildRequires: fdupes @@ -37,6 +40,7 @@ BuildRequires: help2man BuildRequires: pkgconfig BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(udev) +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The software for bladeRF USB 3.0 Superspeed Software Defined Radio. @@ -71,23 +75,28 @@ use of libbladerf. %setup -q -n %{name}-%{release_name} %build +cd host %cmake \ - -DBUILD_DOCUMENTATION=ON + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ + -DCMAKE_BUILD_TYPE=Release \ + -DUDEV_RULES_PATH=%{_udevrulesdir} \ + -DBLADERF_GROUP=%{bladerf_group} \ +%ifnarch %arm ppc ppc64 + -DBUILD_DOCUMENTATION=YES \ +%endif +%if 0%{?use_syslog} + -DENABLE_LIBBLADERF_SYSLOG=ON \ +%endif + -DBUILD_DOCUMENTATION=ON + make %{?_smp_mflags} %install +cd host %cmake_install -# Move libraries to correct location on 64-bit machines -%if %__isa_bits == 64 -mkdir %{buildroot}%{_libdir} -mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir} -rm -rf %{buildroot}%{_prefix}/lib -%endif - -# Move udev rules to correct location -mkdir -p %{buildroot}%{_udevrulesdir} -mv %{buildroot}%{_sysconfdir}/udev/rules.d/88-nuand.rules %{buildroot}%{_udevrulesdir} +%pre +%{_sbindir}/groupadd -r %{bladerf_group} 2> /dev/null || : %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig @@ -101,11 +110,14 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/88-nuand.rules %{buildroot}%{_udevrul %defattr(-,root,root) %doc README.md COPYING CONTRIBUTORS %{_bindir}/bladeRF-cli +# help2man executes ./bladeRF-cli: - that is br0ken when building with qemu's user mode emulation +%ifnarch %arm ppc ppc64 %{_mandir}/man1/bladeRF-cli.1%{ext_man} +%endif %files udev %defattr(-,root,root) -%{_prefix}/lib/udev/rules.d/88-nuand.rules +%{_udevrulesdir}/88-nuand.rules %files -n %{libname} %defattr(-,root,root) From 9c43916a37ac9ddf8e3e7673a631f300765c62a45e65a1aaa682da6824c5a6c4 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 15 Apr 2017 20:47:47 +0000 Subject: [PATCH 2/6] OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=9 --- bladeRF.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/bladeRF.spec b/bladeRF.spec index 2a0d8d1..3996e2f 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -40,7 +40,6 @@ BuildRequires: help2man BuildRequires: pkgconfig BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(udev) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The software for bladeRF USB 3.0 Superspeed Software Defined Radio. @@ -77,17 +76,16 @@ use of libbladerf. %build cd host %cmake \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ - -DCMAKE_BUILD_TYPE=Release \ - -DUDEV_RULES_PATH=%{_udevrulesdir} \ - -DBLADERF_GROUP=%{bladerf_group} \ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ + -DUDEV_RULES_PATH=%{_udevrulesdir} \ + -DBLADERF_GROUP=%{bladerf_group} \ %ifnarch %arm ppc ppc64 - -DBUILD_DOCUMENTATION=YES \ + -DBUILD_DOCUMENTATION=YES \ %endif %if 0%{?use_syslog} - -DENABLE_LIBBLADERF_SYSLOG=ON \ + -DENABLE_LIBBLADERF_SYSLOG=ON \ %endif - -DBUILD_DOCUMENTATION=ON + -DBUILD_DOCUMENTATION=ON make %{?_smp_mflags} From a631efa2365716835090b123415a499754fd6b458b390a5b1b0b66fa22723cff Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 15 Apr 2017 22:32:54 +0000 Subject: [PATCH 3/6] Accepting request 488129 from home:mnhauke:sdr-devel - Workaround for generating manpages/documentation on systems emulated via qemu (arm, ppc,...) not longer needed OBS-URL: https://build.opensuse.org/request/show/488129 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=10 --- bladeRF.changes | 6 ++++++ bladeRF.spec | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bladeRF.changes b/bladeRF.changes index cffc0a5..ace2823 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Apr 15 22:22:28 UTC 2017 - mardnh@gmx.de + +- Workaround for generating manpages/documentation on + systems emulated via qemu (arm, ppc,...) not longer needed + ------------------------------------------------------------------- Sat Apr 15 17:12:59 UTC 2017 - mardnh@gmx.de diff --git a/bladeRF.spec b/bladeRF.spec index 3996e2f..5b376b2 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -79,9 +79,7 @@ cd host -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ -DUDEV_RULES_PATH=%{_udevrulesdir} \ -DBLADERF_GROUP=%{bladerf_group} \ -%ifnarch %arm ppc ppc64 -DBUILD_DOCUMENTATION=YES \ -%endif %if 0%{?use_syslog} -DENABLE_LIBBLADERF_SYSLOG=ON \ %endif @@ -108,10 +106,7 @@ cd host %defattr(-,root,root) %doc README.md COPYING CONTRIBUTORS %{_bindir}/bladeRF-cli -# help2man executes ./bladeRF-cli: - that is br0ken when building with qemu's user mode emulation -%ifnarch %arm ppc ppc64 %{_mandir}/man1/bladeRF-cli.1%{ext_man} -%endif %files udev %defattr(-,root,root) From d06d91306e21fd983bc5c39bfb84964bf6aa0d25e9083376a5266cd4a0253443 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 20 Apr 2017 11:47:04 +0000 Subject: [PATCH 4/6] - Update group handling OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=11 --- bladeRF.changes | 5 +++++ bladeRF.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bladeRF.changes b/bladeRF.changes index ace2823..3a5a747 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 20 11:46:42 UTC 2017 - mpluskal@suse.com + +- Update group handling + ------------------------------------------------------------------- Sat Apr 15 22:22:28 UTC 2017 - mardnh@gmx.de diff --git a/bladeRF.spec b/bladeRF.spec index 5b376b2..79d5e85 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -92,7 +92,7 @@ cd host %cmake_install %pre -%{_sbindir}/groupadd -r %{bladerf_group} 2> /dev/null || : +getent group %{bladerf_group} >/dev/null || groupadd -r %{bladerf_group} %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig From 8a786cf0118a88a152a9520984ac09fa0bb6e22e060dcf18ee2f9c565c62623f Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sun, 23 Apr 2017 20:14:01 +0000 Subject: [PATCH 5/6] Accepting request 490051 from home:mnhauke:sdr-devel - Update group handling OBS-URL: https://build.opensuse.org/request/show/490051 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=12 --- bladeRF.changes | 5 +++++ bladeRF.spec | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/bladeRF.changes b/bladeRF.changes index 3a5a747..6b84337 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Apr 23 19:27:32 UTC 2017 - mardnh@gmx.de + +- Update group handling + ------------------------------------------------------------------- Thu Apr 20 11:46:42 UTC 2017 - mpluskal@suse.com diff --git a/bladeRF.spec b/bladeRF.spec index 79d5e85..03f660e 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -57,6 +57,7 @@ Library for bladeRF, SDR transceiver. %package udev Summary: Udev rules for bladeRF Group: Hardware/Other +Requires(pre): shadow %description udev Udev rules for bladeRF @@ -91,11 +92,12 @@ make %{?_smp_mflags} cd host %cmake_install -%pre -getent group %{bladerf_group} >/dev/null || groupadd -r %{bladerf_group} - %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig + +%pre udev +getent group %{bladerf_group} >/dev/null || groupadd -r %{bladerf_group} + %post udev %udev_rules_update From 3f89e36c55797cc19f1306e76e07c5f15749e16dbb1d7fe2d091d112f2a01d29 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Wed, 26 Apr 2017 19:01:49 +0000 Subject: [PATCH 6/6] Accepting request 491339 from home:mnhauke:sdr-devel - build with support for libtecla OBS-URL: https://build.opensuse.org/request/show/491339 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=13 --- bladeRF.changes | 5 +++++ bladeRF.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/bladeRF.changes b/bladeRF.changes index 6b84337..4013d52 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 26 18:15:47 UTC 2017 - mardnh@gmx.de + +- build with support for libtecla + ------------------------------------------------------------------- Sun Apr 23 19:27:32 UTC 2017 - mardnh@gmx.de diff --git a/bladeRF.spec b/bladeRF.spec index 03f660e..a1b4e0d 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -38,6 +38,7 @@ BuildRequires: gcc-c++ BuildRequires: git-core BuildRequires: help2man BuildRequires: pkgconfig +BuildRequires: tecla-devel BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(udev)