rpms/hamlib/F-9 hamlib-bindings-1.2.7.patch, NONE, 1.1 hamlib.spec, 1.37, 1.38 hamlib-1.2.4-bindings.patch, 1.3, NONE hamlib-1.2.6.2-bindings.patch, 1.3, NONE hamlib-bindings.patch, 1.5, NONE

[Steve Conklin]

Author: sconklin

Update of /cvs/pkgs/rpms/hamlib/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9353

Modified Files:
	hamlib.spec 
Added Files:
	hamlib-bindings-1.2.7.patch 
Removed Files:
	hamlib-1.2.4-bindings.patch hamlib-1.2.6.2-bindings.patch 
	hamlib-bindings.patch 
Log Message:
New patch to fix hamlib-perl


hamlib-bindings-1.2.7.patch:

--- NEW FILE hamlib-bindings-1.2.7.patch ---
--- hamlib-1.2.7/bindings/Makefile.in	2008-02-14 01:03:46.000000000 +0200
+++ hamlib-1.2.7-mod/bindings/Makefile.in	2008-08-26 22:04:23.000000000 +0300
@@ -274,7 +274,7 @@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
 pyexecdir = @pyexecdir@
-pythondir = $(prefix)/lib/python
+pythondir = `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 subdirs = @subdirs@
@@ -668,7 +668,10 @@
 			CC="$(CC)"  \
 			OBJECT="hamlibperl_wrap.o" \
 			VERSION="$(PACKAGE_VERSION)" \
-			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
 
 all-perl: Hamlib-pl.mk hamlibperl_wrap.c
 	$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk all
@@ -685,7 +688,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
 
 uninstall-perl: ## Hamlib-pl.mk
 
--- hamlib-1.2.7/bindings/Makefile.am	2007-11-27 21:55:19.000000000 +0200
+++ hamlib-1.2.7-mod/bindings/Makefile.am	2008-08-26 21:49:34.000000000 +0300
@@ -25,7 +25,10 @@
 			CC="$(CC)"  \
 			OBJECT="hamlibperl_wrap.o" \
 			VERSION="$(PACKAGE_VERSION)" \
-			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
 
 all-perl: Hamlib-pl.mk hamlibperl_wrap.c
 	$(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk all
@@ -43,7 +46,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.
@@ -90,7 +93,7 @@
 
 python_ltlib = _Hamlib.la
 
-pythondir = $(prefix)/lib/python
+pythondir = `python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"`
 
 nodist__Hamlib_la_SOURCES = hamlibpy_wrap.c
 _Hamlib_la_LDFLAGS = -no-undefined -module -avoid-version


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/F-9/hamlib.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- hamlib.spec	7 Jul 2008 17:46:31 -0000	1.37
+++ hamlib.spec	27 Aug 2008 02:45:03 -0000	1.38
@@ -2,7 +2,7 @@
 
 Name:           hamlib
 Version:        1.2.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
@@ -10,7 +10,7 @@
 URL:            http://hamlib.sourceforge.net
 Source0:        ftp://ftp.sourceforge.net/pub/sourceforge/h/ha/hamlib/%{name}-%{version}.tar.gz
 #Install python and perl bindings into proper dirs
-Patch0:         hamlib-1.2.6.2-bindings.patch
+Patch0:         hamlib-bindings-1.2.7.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -205,6 +205,9 @@
 %{_libdir}/hamlibtcl*
 
 %changelog
+* Tue Aug 26 2008 Steve Conklin <fedora at conklinhouse.com> - 1.2.7-4
+- Updated patch to fix hamlib-perl
+
 * Mon Jul  7 2008 Steve Conklin <fedora at conklinhouse.com> - 1.2.7-3
 - Applied suggested patch from Paul Howarth (thanks)
 


--- hamlib-1.2.4-bindings.patch DELETED ---


--- hamlib-1.2.6.2-bindings.patch DELETED ---


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