rpms/hamlib/devel hamlib-1.2.11-bindings.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 hamlib.spec, 1.46, 1.47 sources, 1.9, 1.10 hamlib-1.2.10-bindings.patch, 1.1, NONE hamlib-1.2.10-vfo-copy.patch, 1.1, NONE

[Lucian Langa]

Author: lucilanga

Update of /cvs/pkgs/rpms/hamlib/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5480

Modified Files:
	.cvsignore hamlib.spec sources 
Added Files:
	hamlib-1.2.11-bindings.patch 
Removed Files:
	hamlib-1.2.10-bindings.patch hamlib-1.2.10-vfo-copy.patch 
Log Message:
new upstream release

hamlib-1.2.11-bindings.patch:
 Makefile.am |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE hamlib-1.2.11-bindings.patch ---
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@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	7 Nov 2009 13:19:18 -0000	1.9
+++ .cvsignore	8 Jul 2010 04:18:11 -0000	1.10
@@ -1 +1 @@
-hamlib-1.2.10.tar.gz
+hamlib-1.2.11.tar.gz


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/hamlib.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- hamlib.spec	9 May 2010 10:45:43 -0000	1.46
+++ hamlib.spec	8 Jul 2010 04:18:11 -0000	1.47
@@ -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.11
+Release:        1%{?dist}
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
@@ -10,9 +10,8 @@ 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
+Patch0:         hamlib-1.2.11-bindings.patch
 Patch1:         hamlib-1.2.10-usrp.patch
-Patch2:         hamlib-1.2.10-vfo-copy.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -92,9 +91,8 @@ Hamlib TCL Language bindings to allow ra
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .bindings
 %patch1 -p1 -b .usrp
-%patch2 -p1 -b .vfo-copy
 
 %build
 %configure \
@@ -103,8 +101,8 @@ Hamlib TCL Language bindings to allow ra
         --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 +139,6 @@ find $RPM_BUILD_ROOT -type f -name .pack
 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,6 +211,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/hamlibtcl*
 
 %changelog
+* 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
 - add patch2 - fix double-free in cleanup in dummy module (#587701)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	7 Nov 2009 13:19:18 -0000	1.9
+++ sources	8 Jul 2010 04:18:11 -0000	1.10
@@ -1 +1 @@
-29f0d30779a8ffe0444eb523a6ad8344  hamlib-1.2.10.tar.gz
+1070bba54fb1fb1d538bda6605c07a6c  hamlib-1.2.11.tar.gz


--- hamlib-1.2.10-bindings.patch DELETED ---


--- hamlib-1.2.10-vfo-copy.patch DELETED ---