[hamlib/f13/master] Upstream update to 1.2.12
Randall 'Randy' Berry
dp67 at fedoraproject.org
Tue Sep 7 04:21:36 UTC 2010
commit e53173b82af756c3ae5c99beb60fa33425026d5b
Author: Randall Berry <randyn3lrx at gmail.com>
Date: Tue Sep 7 00:21:40 2010 -0400
Upstream update to 1.2.12
hamlib-1.2.10-bindings.patch | 78 -------------------------------
hamlib-1.2.10-usrp.patch | 11 ----
hamlib-1.2.10-vfo-copy.patch | 18 -------
hamlib-1.2.11-bindings.patch | 31 ++++++++++++
hamlib-1.2.11-python2.7.configure.patch | 12 +++++
hamlib.spec | 52 +++++++++++++++-----
sources | 2 +-
7 files changed, 83 insertions(+), 121 deletions(-)
---
diff --git a/hamlib-1.2.11-bindings.patch b/hamlib-1.2.11-bindings.patch
new file mode 100644
index 0000000..48231e6
--- /dev/null
+++ b/hamlib-1.2.11-bindings.patch
@@ -0,0 +1,31 @@
+diff -Naur hamlib-1.2.11/bindings/Makefile.am hamlib-1.2.11-mod/bindings/Makefile.am
+--- hamlib-1.2.11/bindings/Makefile.am 2010-06-01 00:47:26.000000000 +0300
++++ hamlib-1.2.11-mod/bindings/Makefile.am 2010-07-02 09:11:48.000000000 +0300
+@@ -32,7 +32,8 @@
+ CC="$(CC)" \
+ OBJECT="hamlibperl_wrap.o" \
+ VERSION="$(PACKAGE_VERSION)" \
+- LIBS="-L$(top_builddir)/src/.libs -lhamlib"
++ LIBS="-L$(top_builddir)/src/.libs -lhamlib" \
++ INSTALLDIRS=vendor
+ sed -e 's/^LD_RUN_PATH.*/LD_RUN_PATH =/' Hamlib-pl.mk > Hamlib-pl-norpath.mk
+ mv Hamlib-pl-norpath.mk Hamlib-pl.mk
+
+@@ -52,7 +53,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distcheck
+
+ install-perl: Hamlib-pl.mk
+- $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install_site
++ $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk pure_install
+
+ ## ExtUtils::MakeMaker says uninstall is deprecated and won't remove the files
+ ## anyway, so we'll have to figure out another way to remove the installed files.
+@@ -69,7 +70,7 @@
+
+ tcl_ltlib = hamlibtcl.la
+
+-tcldir = $(prefix)/lib/tcl
++tcldir = $(prefix)/tcl
+
+ PKG_VER=1.0
+ DLL=hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
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 4c54bcc..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.10
-Release: 4%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
Summary: Run-time library to control radio transceivers and receivers
Group: System Environment/Libraries
@@ -10,9 +10,9 @@ License: GPLv2+ and LGPLv2+
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.10-bindings.patch
-Patch1: hamlib-1.2.10-usrp.patch
-Patch2: hamlib-1.2.10-vfo-copy.patch
+Patch0: hamlib-1.2.11-bindings.patch
+# Build against Python 2.7
+Patch2: hamlib-1.2.11-python2.7.configure.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -92,9 +92,9 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1 -b .usrp
-%patch2 -p1 -b .vfo-copy
+%patch0 -p1 -b .bindings
+# Build against Python 2.7
+%patch2 -p1 -b .python-version
%build
%configure \
@@ -103,8 +103,8 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts.
--disable-static \
--with-rigmatrix \
--enable-tcl-binding \
- --with-python-binding \
--with-perl-binding \
+ --with-python-binding \
--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
@@ -141,9 +141,6 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name Hamlib.bs -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perltest.pl -exec rm -f {} ';'
-#installed in the wrong place, better fix needed
-mv $RPM_BUILD_ROOT%{_libdir}/_Hamlib.so $RPM_BUILD_ROOT%{python_sitelib}/_Hamlib.so
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -216,9 +213,38 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/hamlibtcl*
%changelog
+* Mon Sep 6 2010 Randall "Randy" Berry <dp67 at 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 at fedoraproject.org> - 1.2.11-5
+- Rebuild
+
+* Mon Aug 2 2010 Randall "Randy" Berry <dp67 at fedoraproject.org> - 1.2.11-4
+- Build against Python 2.7
+- Fix broken dep python2.7
+
+* Sat Jul 31 2010 Thomas Spura <tomspur at fedoraproject.org> - 1.2.11-3
+- Rebuild for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.2.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Thu Jul 01 2010 Lucian Langa <cooly at gnome.eu.org> - 1.2.11-1
+- update bindings patch
+- drop patch2 - fixed upstream
+- new upstream release
+
* Sun May 09 2010 Lucian Langa <cooly at gnome.eu.org> - 1.2.10-4
- description cleanup
-- fix cleanup in dummy module (#587701)
+- add patch2 - fix double-free in cleanup in dummy module (#587701)
* Sun Nov 08 2009 Lucian Langa <cooly at gnome.eu.org> - 1.2.10-3
- various cleanups
diff --git a/sources b/sources
index d321081..83e4e5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29f0d30779a8ffe0444eb523a6ad8344 hamlib-1.2.10.tar.gz
+914835c0fe4d618d1cd62f1fd0a8dd7d hamlib-1.2.12.tar.gz
More information about the scm-commits
mailing list