rpms/hamlib/F-8 hamlib-bindings-1.2.7.patch, NONE, 1.1 hamlib.spec, 1.26, 1.27
Steve Conklin
sconklin at fedoraproject.org
Wed Aug 27 01:37:37 UTC 2008
Author: sconklin
Update of /cvs/pkgs/rpms/hamlib/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5886
Modified Files:
hamlib.spec
Added Files:
hamlib-bindings-1.2.7.patch
Log Message:
Updated patch for 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-8/hamlib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- hamlib.spec 16 Feb 2008 19:02:55 -0000 1.26
+++ hamlib.spec 27 Aug 2008 01:37:07 -0000 1.27
@@ -2,7 +2,7 @@
Name: hamlib
Version: 1.2.7
-Release: 1%{?dist}
+Release: 2%{?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)
@@ -199,6 +199,8 @@
%{_libdir}/hamlibtcl*
%changelog
+* Tue Aug 26 2008 Steve Conklin <fedora at conklinhouse.com> - 1.2.7-2
+- Patch to fix broken hamlib-perl
* Sat Feb 16 2008 Steve Conklin - 1.2.7
- New upstream version
* Sun Dec 09 2007 Sindre Pedersen Bjørdal - 1.2.6.2-5
More information about the fedora-extras-commits
mailing list