[hamlib] fix building with gnuradio
Lucian Langa
lucilanga at fedoraproject.org
Mon Jul 4 15:26:10 UTC 2011
commit 48c2df8d90e9cd3154b2f5530078939a131e7881
Author: Lucian Langa <lucilanga at gnome.org>
Date: Mon Jul 4 18:25:16 2011 +0300
fix building with gnuradio
hamlib-1.2.13.1-usrp-includes.patch | 12 ++++++++++++
hamlib.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/hamlib-1.2.13.1-usrp-includes.patch b/hamlib-1.2.13.1-usrp-includes.patch
new file mode 100644
index 0000000..586b391
--- /dev/null
+++ b/hamlib-1.2.13.1-usrp-includes.patch
@@ -0,0 +1,12 @@
+diff -Naur hamlib-1.2.13.1-mod/kit/usrp_impl.cc hamlib-1.2.13.1/kit/usrp_impl.cc
+--- hamlib-1.2.13.1-mod/kit/usrp_impl.cc 2011-03-13 16:50:12.000000000 +0200
++++ hamlib-1.2.13.1/kit/usrp_impl.cc 2011-07-04 16:31:18.000000000 +0300
+@@ -32,7 +32,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
+-#include <usrp_standard.h>
++#include <usrp/usrp_standard.h>
+
+ #include "usrp_impl.h"
+ #include "token.h"
diff --git a/hamlib.spec b/hamlib.spec
index 553a0a4..e0099d9 100644
--- a/hamlib.spec
+++ b/hamlib.spec
@@ -2,7 +2,7 @@
Name: hamlib
Version: 1.2.13.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Run-time library to control radio transceivers and receivers
Group: System Environment/Libraries
@@ -11,6 +11,7 @@ URL: http://hamlib.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
#Install python and perl bindings into proper dirs
Patch0: hamlib-1.2.13-bindings.patch
+Patch1: hamlib-1.2.13.1-usrp-includes.patch
# Build against Python 2.7
Patch2: hamlib-1.2.11-python2.7.configure.patch
@@ -98,6 +99,7 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts.
%prep
%setup -q
%patch0 -p1 -b .bindings
+%patch1 -p1 -b .includes
# Build against Python 2.7
%patch2 -p1 -b .python-version
@@ -218,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/hamlibtcl*
%changelog
+* Mon Jul 04 2011 Lucian Langa <cooly at gnome.eu.org> - 1.2.13.1-2
+- add patch to fix building with latest gnuradio
+
* Thu Jun 16 2011 Lucian Langa <cooly at gnome.eu.org> - 1.2.13.1-1
- new upstream release
More information about the scm-commits
mailing list