- various cleanups

- disable rpath
- rebuild using system libltdl

hamlib.spec

@@ -2,7 +2,7 @@
 
 Name:           hamlib
 Version:        1.2.10
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
@@ -16,7 +16,7 @@ Patch1:         hamlib-1.2.10-usrp.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, swig, gd-devel, libxml2-devel, tcl-devel
-BuildRequires:  libusb-devel, pkgconfig, boost-devel
+BuildRequires:  libusb-devel, pkgconfig, boost-devel, libtool-ltdl-devel
 BuildRequires:  doxygen, gnuradio-devel, usrp-devel
 #for perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -96,12 +96,16 @@ Hamlib TCL Language bindings to allow radio control from TCL scripts.
 
 %build
 %configure \
+        --with-ldtl-include=%{_includedir} \
+        --with-ldtl-lib=%{_libdir} \
         --disable-static \
         --with-rigmatrix \
         --enable-tcl-binding \
         --with-python-binding \
         --with-perl-binding \
-	--with-usrp
+        --with-usrp
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 # Build libs, drivers, and programs, won't build with smpflags
 make
@@ -114,10 +118,10 @@ make DESTDIR=$RPM_BUILD_ROOT install
 #install documentation
 mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html/search
 for f in `find doc/html/ -type f -maxdepth 1`
-	do install -D -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}/`echo $f | cut -d '/' -f2`
+        do install -D -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}/`echo $f | cut -d '/' -f2`
 done
 for f in `find doc/html/search -type f -maxdepth 1`
-	do install -D -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}/html/`echo $f | cut -d '/' -f3`
+        do install -D -m 0644 $f $RPM_BUILD_ROOT%{_docdir}/%{name}/html/`echo $f | cut -d '/' -f3`
  done
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la
@@ -177,6 +181,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/hamlib.pc
 
 %files doc
+%defattr(-, root, root, -)
 %doc %{_docdir}/%{name}
 
 %files c++
@@ -209,6 +214,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/hamlibtcl*
 
 %changelog
+* Sun Nov 08 2009 Lucian Langa <cooly@gnome.eu.org> - 1.2.10-3
+- various cleanups
+- disable rpath
+- rebuild using system libltdl
+
 * Sat Nov 07 2009 Lucian Langa <cooly@gnome.eu.org> - 1.2.10-2
 - build with usrp backend