devel/hamlib hamlib-bindings.patch,1.1,1.2 hamlib.spec,1.7,1.8

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/devel/hamlib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19443

Modified Files:
	hamlib-bindings.patch hamlib.spec 
Log Message:
Fixed Python binding

hamlib-bindings.patch:

Index: hamlib-bindings.patch
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib-bindings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hamlib-bindings.patch	16 Mar 2005 17:05:32 -0000	1.1
+++ hamlib-bindings.patch	23 Mar 2005 23:28:05 -0000	1.2
@@ -14,7 +14,7 @@
  pyexecdir = @pyexecdir@
  
 -pythondir = $(prefix)/lib/python
-+pythondir = $(prefix)/lib/python2.3
++pythondir = $(libdir)/python2.3
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  subdirs = @subdirs@


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/devel/hamlib/hamlib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- hamlib.spec	21 Mar 2005 18:36:05 -0000	1.7
+++ hamlib.spec	23 Mar 2005 23:28:05 -0000	1.8
@@ -1,6 +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.3
-Release: 7
+Release: 8
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transceivers and receivers
@@ -62,12 +64,13 @@
 %package python
 Summary: Hamlib radio control library Python binding
 Group: Development/Libraries
+Requires: python-abi = %(%{__python} -c 'import sys;print(sys.version[:3])')
 
 %description python
 Hamlib Python Language bindings to allow radio control from Python scripts.
 
 %prep
-%setup
+%setup -q
 %patch -p1
 %patch1 -p1
 %build
@@ -109,6 +112,7 @@
         sharedstatedir=$RPM_BUILD_ROOT%{_sharedstatedir} \
         mandir=$RPM_BUILD_ROOT%{_mandir} \
         infodir=$RPM_BUILD_ROOT%{_infodir} \
+        pythondir=$RPM_BUILD_ROOT%{python_sitelib} \
    install-pythonPYTHON
 
 # Install PERL 
@@ -182,9 +186,7 @@
 
 %files python
 %defattr(-, root, root)
-%{_libdir}/python2.3/Hamlib.py
-%{_libdir}/python2.3/Hamlib.pyc
-%{_libdir}/python2.3/Hamlib.pyo
+%{python_sitelib}/*.py*
 
 %files devel
 %defattr(-, root, root)
@@ -201,6 +203,10 @@
 
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-8
+- Added -q to %%setup
+- Fixed Python binding build and Requires
+
 * Mon Mar 21 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-7
 - Removed spurious period and spelling mistake in Summary