[hamlib/f16] Revert conflicting commits regarding usrp

[Jaroslav Škarvada]

commit 572bc2db821d238c7cfb033fde009fd271b1c352
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Mon Jan 9 10:00:30 2012 +0100

    Revert conflicting commits regarding usrp

 hamlib.spec |   22 +++-------------------
 1 files changed, 3 insertions(+), 19 deletions(-)
---
diff --git a/hamlib.spec b/hamlib.spec
index beb5891..fb51d52 100644
--- a/hamlib.spec
+++ b/hamlib.spec
@@ -2,11 +2,7 @@
 
 Name:           hamlib
 Version:        1.2.14
-<<<<<<< HEAD
-Release:        4%{?dist}
-=======
 Release:        2%{?dist}
->>>>>>> f94d5bbfbe946f03408a76c1f381b3496b182cea
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
@@ -23,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, swig, gd-devel, libxml2-devel, tcl-devel
 BuildRequires:  libusb-devel, pkgconfig, boost-devel, libtool-ltdl-devel
-BuildRequires:  doxygen, gnuradio-devel
+BuildRequires:  doxygen, gnuradio-devel, usrp-devel
 #for perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
 
@@ -116,7 +112,7 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts.
         --enable-tcl-binding \
         --with-perl-binding \
         --with-python-binding \
-#	usrp depreciated
+        --with-usrp
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
@@ -224,21 +220,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/hamlibtcl*
 
 %changelog
-<<<<<<< HEAD
-* Thu Dec 29 2011 Randall "Randy" Berry <dp67 at fedoraproject.org> - 1.2.14-4
-- Rebuild to fix broken deps libusrp
-
-* Wed Dec 07 2011 Randall "Randy" Berry <dp67 at fedoraproject.org> - 1.2.14-3
-- Rebuild to fix broken deps libusrp
-
-* Wed Dec 07 2011 Randall "Randy" Berry <dp67 at fedoraproject.org> - 1.2.14-2
-- Rebuild to fix broken deps libusrp
-- Apply --without-usrp
-=======
 * Fri Dec 23 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 1.2.14-2
 - rebuild against newer libusrp
   Resolves: rhbz#769729
->>>>>>> f94d5bbfbe946f03408a76c1f381b3496b182cea
 
 * Sun Jul 31 2011 Lucian Langa <cooly at gnome.eu.org> - 1.2.14-1
 - new upstream release
@@ -257,7 +241,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
-* Wed Feb 2 2011 Randall "Randy" Berry N3LRX <dp67 at fedoraproject.org> - 1.2.12-3
+* Wed Feb 2 2011 Randall "Randy" Berry <dp67 at fedoraproject.org> - 1.2.12-3
 - Rebuild to fix broken deps libxml2
 
 * Fri Nov 05 2010 Lucian Langa <cooly at gnome.eu.org> - 1.2.12-2