From 1e04835e7b18d6a5fcc861611a67ece1e231d167 Mon Sep 17 00:00:00 2001
From: Ignacio Vazquez-Abrams <ivazquez@fedoraproject.org>
Date: Wed, 6 Apr 2005 10:00:28 +0000
Subject: [PATCH] - Upstream update - Spec file cleanups

---
 .cvsignore  |  2 +-
 hamlib.spec | 33 ++++++++++++++++-----------------
 sources     |  2 +-
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 66a0eb8..ea95fe6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-hamlib-1.2.3.tar.gz
+hamlib-1.2.4.tar.gz
diff --git a/hamlib.spec b/hamlib.spec
index c411c53..7d8d06a 100644
--- a/hamlib.spec
+++ b/hamlib.spec
@@ -1,12 +1,12 @@
 %{!?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: 9
+Version: 1.2.4
+Release: 1
 License: LGPL
 Group: System Environment/Libraries
 Summary: Run-time library to control radio transceivers and receivers
-Source: ftp://ftp.sourceforge.net/pub/sourceforge/hamlib/hamlib-1.2.3.tar.gz
+Source: ftp://ftp.sourceforge.net/pub/sourceforge/hamlib/hamlib-1.2.4.tar.gz
 
 # For whatever reason @SWIG@ isn't being set by the configure script.
 Patch: hamlib-bindings.patch
@@ -73,8 +73,8 @@ Hamlib Python Language bindings to allow radio control from Python scripts.
 %setup -q
 %patch -p1
 %patch1 -p1
-%build
 
+%build
 %configure \
         --with-rigmatrix \
         --without-tcl-binding \
@@ -85,23 +85,19 @@ Hamlib Python Language bindings to allow radio control from Python scripts.
 make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" all
 
 # Build PERL and Python bindings
-pushd bindings
-  #  make all-perl
-  make all-py
-popd
+make -C bindings all-py
+#make -C bindings all-perl
+
 # Build Documentation
-pushd doc
-  make doc
-popd
+make -C doc doc
 
 %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} \
+make -C bindings prefix=$RPM_BUILD_ROOT%{_prefix} \
         exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
         bindir=$RPM_BUILD_ROOT%{_bindir} \
         sbindir=$RPM_BUILD_ROOT%{_sbindir} \
@@ -118,7 +114,7 @@ make prefix=$RPM_BUILD_ROOT%{_prefix} \
    install-pythonPYTHON
 
 # Install PERL 
-# make prefix=$RPM_BUILD_ROOT%{_prefix} \
+#make -C bindings prefix=$RPM_BUILD_ROOT%{_prefix} \
 #        exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \
 #        bindir=$RPM_BUILD_ROOT%{_bindir} \
 #        sbindir=$RPM_BUILD_ROOT%{_sbindir} \
@@ -132,7 +128,6 @@ make prefix=$RPM_BUILD_ROOT%{_prefix} \
 #        mandir=$RPM_BUILD_ROOT%{_mandir} \
 #        infodir=$RPM_BUILD_ROOT%{_infodir} \
 #   install-perl
-popd
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -154,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/rotctl
 %{_sbindir}/rpc.rigd
 %{_sbindir}/rpc.rotd
-%{_libdir}/libhamlib-%{version}.so.2.0.2
+%{_libdir}/libhamlib-%{version}.so.*
 %{_libdir}/hamlib-*.so
 %{_libdir}/libhamlib.la
 %{_mandir}/man8/rpc.rigd.8.gz
@@ -166,7 +161,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files c++
 %defattr(-, root, root)
-%{_libdir}/libhamlib++-%{version}.so.2.0.0
+%{_libdir}/libhamlib++-%{version}.so.*
 %{_libdir}/libhamlib++.la
 
 %files c++-devel
@@ -205,6 +200,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr  6 2005 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 1.2.4-1
+- Upstream update
+- Spec file cleanups
+
 * Wed Mar 23 2005 Ignacio Vazquez-Abrams <ivazquez@ivazquez.net> 1.2.3-9
 - Python binding cleanup
 - soname/ldconfig cleanup
diff --git a/sources b/sources
index 8f8533e..c5322fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f049d6d126d5391adde5cc7838483564  hamlib-1.2.3.tar.gz
+f49f961fd8d895aec7bd247d5fd5b772  hamlib-1.2.4.tar.gz