rpms/hamlib/FC-3 hamlib-bindings.patch,1.1,1.2 hamlib.spec,1.7,1.8

[Ignacio Vazquez-Abrams (ivazquez)]

Author: ivazquez

Update of /cvs/extras/rpms/hamlib/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2966

Modified Files:
	hamlib-bindings.patch hamlib.spec 
Log Message:
Various fixes and cleanups

hamlib-bindings.patch:

Index: hamlib-bindings.patch
===================================================================
RCS file: /cvs/extras/rpms/hamlib/FC-3/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	24 Mar 2005 12:38:56 -0000	1.2
@@ -9,12 +9,3 @@
  TCL_BIN_DIR = @TCL_BIN_DIR@
  TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
  TCL_LIB_FILE = @TCL_LIB_FILE@
-@@ -195,7 +195,7 @@
- program_transform_name = @program_transform_name@
- pyexecdir = @pyexecdir@
- 
--pythondir = $(prefix)/lib/python
-+pythondir = $(prefix)/lib/python2.3
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- subdirs = @subdirs@


Index: hamlib.spec
===================================================================
RCS file: /cvs/extras/rpms/hamlib/FC-3/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	24 Mar 2005 12:38:56 -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: 9
 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
@@ -94,6 +97,8 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
+rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la
+/sbin/ldconfig -N -n $RPM_BUILDROOT%{_libdir}
 pushd bindings
 # Install Python
 make prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -109,6 +114,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 
@@ -141,7 +147,7 @@
 
 %files
 %defattr(-, root, root)
-%doc COPYING doc/html
+%doc COPYING.LIB doc/html
 %{_bindir}/rigctl
 %{_bindir}/rigmem
 %{_bindir}/rigswr
@@ -151,7 +157,6 @@
 %{_libdir}/libhamlib-%{version}.so.2.0.2
 %{_libdir}/hamlib-*.so
 %{_libdir}/libhamlib.la
-%{_libdir}/hamlib-*.la
 %{_mandir}/man8/rpc.rigd.8.gz
 %{_mandir}/man8/rpc.rotd.8.gz
 %{_mandir}/man1/rigctl.1.gz
@@ -182,16 +187,15 @@
 
 %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)
+%doc README.developer
 %{_libdir}/libhamlib.so
 %{_libdir}/libhamlib.a
-%{_libdir}/hamlib-*.a
 %{_datadir}/aclocal/hamlib.m4
+%dir %{_includedir}/hamlib
 %{_includedir}/hamlib/rig.h
 %{_includedir}/hamlib/riglist.h
 %{_includedir}/hamlib/rig_dll.h
@@ -201,6 +205,17 @@
 
 
 %changelog
+* Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.3-9
+- Python binding cleanup
+- soname/ldconfig cleanup
+- Added %%{_includedir}/hamlib to -devel
+- Removed %%{_libdir}/hamlib-*.a and hamlib-*.la
+- %%doc cleanups
+
+* 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