From 15e5243d0341ff3b3628e7d511f07d5edda36c85 Mon Sep 17 00:00:00 2001
From: Randall Berry <randyn3lrx@gmail.com>
Date: Sep 07 2010 04:03:37 +0000
Subject: new upstream release 1.2.12


---

diff --git a/hamlib-1.2.10-usrp.patch b/hamlib-1.2.10-usrp.patch
deleted file mode 100644
index 6638eeb..0000000
--- a/hamlib-1.2.10-usrp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hamlib-1.2.10/kit/usrp_impl.cc	2009-11-03 00:17:44.000000000 +0200
-+++ hamlib-1.2.10-mod/kit/usrp_impl.cc	2009-11-07 19:17:08.000000000 +0200
-@@ -82,7 +82,7 @@
- 	int which_board = 0;
- 	int decim = 125;
- 	
--	priv->urx = usrp_standard_rx::make (which_board, decim, 1, -1, usrp_standard_rx::FPGA_MODE_NORMAL);
-+	priv->urx = usrp_standard_rx::make (which_board, decim, 1, -1, usrp_standard_rx::FPGA_MODE_NORMAL).get();
- 	if (priv->urx == 0)
- 		return -RIG_EIO;
- 
diff --git a/hamlib.spec b/hamlib.spec
index d21b859..9c09ecd 100644
--- a/hamlib.spec
+++ b/hamlib.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           hamlib
-Version:        1.2.11
-Release:        5%{?dist}
+Version:        1.2.12
+Release:        1%{?dist}
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
@@ -11,7 +11,6 @@ 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.11-bindings.patch
-Patch1:         hamlib-1.2.10-usrp.patch
 # Build against Python 2.7
 Patch2:		hamlib-1.2.11-python2.7.configure.patch
 
@@ -94,7 +93,6 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts.
 %prep
 %setup -q
 %patch0 -p1 -b .bindings
-%patch1 -p1 -b .usrp
 # Build against Python 2.7
 %patch2 -p1 -b .python-version
 
@@ -215,6 +213,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/hamlibtcl*
 
 %changelog
+* Mon Sep 6 2010 Randall "Randy" Berry <dp67@fedoraproject.org> - 1.2.12-1
+- New upstream release
+- Apply patches to new source
+- Removed patch1 applied upstream (usrp.patch)
+- Upstream-release-monitoring bz 630702
+- Upstream changes:
+- New models: PCR-2500, RX331, TRP 8255 S R
+- New rotator backends: DF9GR's ERC
+- Fixes and features: Paragon, TS-690S, FT-920, FT-990, FT-2000,
+- Elektor SDR-USB, IC-7000, IC-7700, AR-8200, AR-8600
+
 * Mon Aug 2 2010 Randall "Randy" Berry <dp67@fedoraproject.org> - 1.2.11-5
 - Rebuild
 
diff --git a/sources b/sources
index 7ef8d04..83e4e5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1070bba54fb1fb1d538bda6605c07a6c  hamlib-1.2.11.tar.gz
+914835c0fe4d618d1cd62f1fd0a8dd7d  hamlib-1.2.12.tar.gz