[hamlib/f16: 2/2] no usrp includes

[Randall 'Randy' Berry]

commit 61eee01b5dcbe8292144e9bc4725a918f5f82cea
Merge: fcfffe6 f94d5bb
Author: dp67 <dp67 at fedoraproject.org>
Date:   Thu Dec 29 21:27:19 2011 -0500

    no usrp includes

 hamlib.spec |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --cc hamlib.spec
index 29a50d3,fb51d52..beb5891
--- a/hamlib.spec
+++ b/hamlib.spec
@@@ -2,7 -2,7 +2,11 @@@
  
  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
@@@ -220,15 -220,9 +224,21 @@@ rm -rf $RPM_BUILD_ROO
  %{_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