rpms/hamlib/F-9 hamlib-bindings-1.2.8.patch, NONE, 1.1 hamlib.spec, 1.38, 1.39 sources, 1.8, 1.9

Sindre Pedersen Bjørdal sindrepb at fedoraproject.org
Mon Dec 15 22:52:51 UTC 2008 

Author: sindrepb

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

Modified Files:
	hamlib.spec sources 
Added Files:
	hamlib-bindings-1.2.8.patch 
Log Message:
new upstream

hamlib-bindings-1.2.8.patch:

--- NEW FILE hamlib-bindings-1.2.8.patch ---
diff -up ./bindings/Makefile.am.orig ./bindings/Makefile.am
--- ./bindings/Makefile.am.orig	2008-12-15 23:00:24.000000000 +0100
+++ ./bindings/Makefile.am	2008-12-15 23:00:41.000000000 +0100
@@ -29,7 +29,7 @@ Hamlib-pl.mk: $(srcdir)/Makefile.PL
 			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
 
@@ -49,7 +49,7 @@ distcheck-perl: Hamlib-pl.mk
 	$(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.
@@ -62,7 +62,7 @@ uninstall-perl: ## Hamlib-pl.mk
 
 tcl_ltlib = hamlibtcl.la
 
-tcldir = $(prefix)/lib/tcl
+tcldir = $(libdir)/tcl
 
 PKG_VER=1.0
 DLL=hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
@@ -96,7 +96,7 @@ uninstall-tcl: 
 
 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
diff -up ./bindings/Makefile.in.orig ./bindings/Makefile.in
--- ./bindings/Makefile.in.orig	2008-12-15 23:00:08.000000000 +0100
+++ ./bindings/Makefile.in	2008-12-15 23:00:03.000000000 +0100
@@ -273,7 +273,7 @@ prefix = @prefix@
 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@
@@ -289,7 +289,7 @@ AM_CFLAGS = -fno-strict-aliasing
 ##########################################
 # Tcl binding
 tcl_ltlib = hamlibtcl.la
-tcldir = $(prefix)/lib/tcl
+tcldir = $(libdir)/tcl
 PKG_VER = 1.0
 DLL = hamlibtcl-$(PKG_VER)@TCL_SHLIB_SUFFIX@
 nodist_hamlibtcl_la_SOURCES = hamlibtcl_wrap.c
@@ -669,7 +669,7 @@ Hamlib-pl.mk: $(srcdir)/Makefile.PL
 			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
 
@@ -688,7 +688,7 @@ distcheck-perl: Hamlib-pl.mk
 	$(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
 


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/F-9/hamlib.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- hamlib.spec	27 Aug 2008 02:45:03 -0000	1.38
+++ hamlib.spec	15 Dec 2008 22:52:21 -0000	1.39
@@ -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.7
-Release:        4%{?dist}
+Version:        1.2.8
+Release:        1%{?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-bindings-1.2.7.patch
+Patch0:         hamlib-bindings-1.2.8.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,7 +68,6 @@
 Summary: Hamlib radio control library Perl binding
 Group: Development/Libraries
 Requires: hamlib = %{version}-%{release}
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 Hamlib PERL Language bindings to allow radio control from PERL scripts.
@@ -101,9 +100,6 @@
         --with-python-binding \
         --with-perl-binding
 
-# Avoid RPATHs on x86_64
-sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="%{_lib} %{_libdir}|' libtool
-
 # Build libs, drivers, and programs, won't build with smpflags
 make
 # Build Documentation
@@ -115,7 +111,7 @@
 #install documentation
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html
 for f in `ls doc/html/`
-        do install -m 0644 doc/html/$f $RPM_BUILD_ROOT%{_docdir}/%{name}/html/$f 
+	do install -m 0644 doc/html/$f $RPM_BUILD_ROOT%{_docdir}/%{name}/html/$f 
 done
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la
@@ -173,7 +169,6 @@
 %{_libdir}/pkgconfig/hamlib.pc
 
 %files doc
-%defattr(-, root, root)
 %doc %{_docdir}/%{name}
 
 %files c++
@@ -191,8 +186,7 @@
 %files perl
 %defattr(-, root, root)
 %doc COPYING.LIB
-%{perl_vendorarch}/auto/Hamlib/
-%{perl_vendorarch}/Hamlib.pm
+%{perl_vendorarch}/*
 
 %files python
 %defattr(-, root, root)
@@ -205,14 +199,14 @@
 %{_libdir}/hamlibtcl*
 
 %changelog
-* Tue Aug 26 2008 Steve Conklin <fedora at conklinhouse.com> - 1.2.7-4
-- Updated patch to fix hamlib-perl
+* Mon Dec 15 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 1.2.8-1
+- New upstream release
 
-* Mon Jul  7 2008 Steve Conklin <fedora at conklinhouse.com> - 1.2.7-3
-- Applied suggested patch from Paul Howarth (thanks)
+* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.2.7-3
+- Rebuild for Python 2.6
 
-* Mon Jul  7 2008 Steve Conklin <fedora at conklinhouse.com> - 1.2.7-2
-- Rebuild to satisfy Perl dependency, add dependency
+* Tue Aug 26 2008 Steve Conklin <fedora at conklinhouse.com> - 1.2.7-2
+- New patch to fix hamlib-perl
 
 * Fri Feb 15 2008 Steve Conklin <sconklin at redhat.com> - 1.2.7-1
 - New upstream released


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	7 Jul 2008 16:58:07 -0000	1.8
+++ sources	15 Dec 2008 22:52:21 -0000	1.9
@@ -1 +1 @@
-adf561c007f8a3a1affecd58fccd67df  hamlib-1.2.7.tar.gz
+74eaf1be4cf1cbdecee54808c6930788  hamlib-1.2.8.tar.gz

More information about the fedora-extras-commits mailing list