diff --git a/.gitignore b/.gitignore index acac3b8..dc04942 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ hamlib-1.2.11.tar.gz /hamlib-1.2.13.1.tar.gz /hamlib-1.2.14.tar.gz /hamlib-1.2.15.tar.gz +/hamlib-1.2.15.1.tar.gz diff --git a/hamlib-1.2.15-cpp.patch b/hamlib-1.2.15-cpp.patch deleted file mode 100644 index 123b249..0000000 --- a/hamlib-1.2.15-cpp.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Naur hamlib-1.2.15/rpcrig/Makefile.am hamlib-1.2.15-mod/rpcrig/Makefile.am ---- hamlib-1.2.15/rpcrig/Makefile.am 2011-08-23 05:06:25.000000000 +0200 -+++ hamlib-1.2.15-mod/rpcrig/Makefile.am 2012-02-06 10:21:06.922381977 +0100 -@@ -30,7 +30,7 @@ - - EXTRA_DIST = rpcrig.x $(man_MANS) - --RPCGEN = rpcgen -+RPCGEN = rpcgen -Y $(bindir) - - rpcrig.h: Makefile rpcrig.x - rm -f $@ -diff -Naur hamlib-1.2.15/rpcrig/Makefile.in hamlib-1.2.15-mod/rpcrig/Makefile.in ---- hamlib-1.2.15/rpcrig/Makefile.in 2012-02-03 03:47:03.000000000 +0100 -+++ hamlib-1.2.15-mod/rpcrig/Makefile.in 2012-02-06 10:57:36.241524111 +0100 -@@ -353,7 +353,8 @@ - rpc_rigd_LDFLAGS = @BACKENDLNK@ - man_MANS = rpc.rigd.8 - EXTRA_DIST = rpcrig.x $(man_MANS) --RPCGEN = rpcgen -+RPCGEN = rpcgen -Y $(bindir) -+ - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - -diff -Naur hamlib-1.2.15/rpcrot/Makefile.am hamlib-1.2.15-mod/rpcrot/Makefile.am ---- hamlib-1.2.15/rpcrot/Makefile.am 2011-08-23 05:06:25.000000000 +0200 -+++ hamlib-1.2.15-mod/rpcrot/Makefile.am 2012-02-06 12:04:23.821784290 +0100 -@@ -31,7 +31,7 @@ - - EXTRA_DIST = rpcrot.x $(man_MANS) - --RPCGEN = rpcgen -+RPCGEN = rpcgen -Y $(bindir) - - rpcrot.h: Makefile rpcrot.x - rm -f $@ -diff -Naur hamlib-1.2.15/rpcrot/Makefile.in hamlib-1.2.15-mod/rpcrot/Makefile.in ---- hamlib-1.2.15/rpcrot/Makefile.in 2012-02-03 03:47:03.000000000 +0100 -+++ hamlib-1.2.15-mod/rpcrot/Makefile.in 2012-02-06 12:04:14.690783695 +0100 -@@ -353,7 +353,7 @@ - rpc_rotd_LDFLAGS = @ROT_BACKENDLNK@ - man_MANS = rpc.rotd.8 - EXTRA_DIST = rpcrot.x $(man_MANS) --RPCGEN = rpcgen -+RPCGEN = rpcgen -Y $(bindir) - all: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) all-am - diff --git a/hamlib.spec b/hamlib.spec index 39e0a62..3d0286e 100644 --- a/hamlib.spec +++ b/hamlib.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: hamlib -Version: 1.2.15 +Version: 1.2.15.1 Release: 1%{?dist} Summary: Run-time library to control radio transceivers and receivers @@ -11,14 +11,12 @@ 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 -#temporary patch to fix usrmove mess -Patch1: hamlib-1.2.15-cpp.patch 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 #for perl BuildRequires: perl(ExtUtils::MakeMaker) @@ -98,7 +96,6 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts. %prep %setup -q %patch0 -p1 -b .bindings -%patch1 -p1 -b .cpp %build %configure \ @@ -217,6 +214,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/hamlibtcl* %changelog +* Wed Mar 14 2012 Lucian Langa - 1.2.15.1-1 +- remove gnuradio dependency as we do not require it +- drop temporary patch +- new upstream release + * Sun Feb 05 2012 Lucian Langa - 1.2.15-1 - add temporary patch to fix usrmove issues - drop patch 1 - no longer building with usrp diff --git a/sources b/sources index 81e1b32..5a5aac3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8c10041b75d41a8b585a78fd14564387 hamlib-1.2.15.tar.gz +d80d1214fdd4a4ced08a6ccdffe084eb hamlib-1.2.15.1.tar.gz