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..4013d52 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +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 + +- Update group handling + +------------------------------------------------------------------- +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 + +- 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 + +- 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..a1b4e0d 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 @@ -35,6 +38,7 @@ BuildRequires: gcc-c++ BuildRequires: git-core BuildRequires: help2man BuildRequires: pkgconfig +BuildRequires: tecla-devel BuildRequires: pkgconfig(libusb-1.0) BuildRequires: pkgconfig(udev) @@ -54,6 +58,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 @@ -71,26 +76,29 @@ use of libbladerf. %setup -q -n %{name}-%{release_name} %build +cd host %cmake \ + -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 -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} - %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 @@ -105,7 +113,7 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/88-nuand.rules %{buildroot}%{_udevrul %files udev %defattr(-,root,root) -%{_prefix}/lib/udev/rules.d/88-nuand.rules +%{_udevrulesdir}/88-nuand.rules %files -n %{libname} %defattr(-,root,root)