From 2529e4f05c993726074c166eeb91a8455d95ec7c Mon Sep 17 00:00:00 2001 From: Randall Berry Date: Mon, 2 Aug 2010 13:20:17 -0400 Subject: [PATCH] Fix broken dep Python2.7 --- hamlib-1.2.11-python2.7.configure.patch | 12 ++++++++++++ hamlib.spec | 8 ++++++++ 2 files changed, 20 insertions(+) create mode 100644 hamlib-1.2.11-python2.7.configure.patch diff --git a/hamlib-1.2.11-python2.7.configure.patch b/hamlib-1.2.11-python2.7.configure.patch new file mode 100644 index 0000000..d655d7a --- /dev/null +++ b/hamlib-1.2.11-python2.7.configure.patch @@ -0,0 +1,12 @@ +diff -up ./configure.old ./configure +--- ./configure.old 2010-05-31 17:50:18.000000000 -0400 ++++ ./configure 2010-07-31 00:42:13.430307466 -0400 +@@ -19232,7 +19232,7 @@ if test "${am_cv_pathless_PYTHON+set}" = + $as_echo_n "(cached) " >&6 + else + +- for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do ++ for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.7 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do + test "$am_cv_pathless_PYTHON" = none && break + prog="import sys + # split strings by '.' and convert to numeric. Append some zeros diff --git a/hamlib.spec b/hamlib.spec index 0f11031..39a9508 100644 --- a/hamlib.spec +++ b/hamlib.spec @@ -12,6 +12,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. #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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -93,6 +95,8 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts. %setup -q %patch0 -p1 -b .bindings %patch1 -p1 -b .usrp +# Build against Python 2.7 +%patch2 -p1 -b .python-version %build %configure \ @@ -211,6 +215,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/hamlibtcl* %changelog +* Mon Aug 2 2010 Randall "Randy" Berry - 1.2.11-3 +- Build against Python 2.7 +- Fix broken dep python2.7 + * Sat Jul 31 2010 Thomas Spura - 1.2.11-3 - Rebuild for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild