rpms/hamlib/F-12 hamlib.spec,1.43,1.44

[Lucian Langa]

Author: lucilanga

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

Modified Files:
	hamlib.spec 
Log Message:
rebuild using system's ltdl


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/F-12/hamlib.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- hamlib.spec	7 Nov 2009 15:19:08 -0000	1.43
+++ hamlib.spec	11 Mar 2010 17:23:41 -0000	1.44
@@ -2,7 +2,7 @@
 
 Name:           hamlib
 Version:        1.2.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
@@ -15,7 +15,7 @@ Patch0:         hamlib-1.2.10-bindings.p
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, swig, gd-devel, libxml2-devel, tcl-devel
-BuildRequires:  libusb-devel, pkgconfig
+BuildRequires:  libusb-devel, pkgconfig, libtool-ltdl-devel
 BuildRequires:  doxygen
 #for perl
 BuildRequires:  perl(ExtUtils::MakeMaker)
@@ -94,11 +94,15 @@ Hamlib TCL Language bindings to allow ra
 
 %build
 %configure \
+        --with-ldtl-include=%{_includedir} \
+        --with-ldtl-lib=%{_libdir} \
         --disable-static \
         --with-rigmatrix \
         --enable-tcl-binding \
         --with-python-binding \
         --with-perl-binding
+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
@@ -174,6 +178,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/hamlib.pc
 
 %files doc
+%defattr(-, root, root, -)
 %doc %{_docdir}/%{name}
 
 %files c++
@@ -206,6 +211,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/hamlibtcl*
 
 %changelog
+* Thu Mar 11 2010 Lucian Langa <cooly at gnome.eu.org> - 1.2.10-2
+- kill rpath
+- misc cleanups
+- use system ltdl (#563975)
+
 * Sat Nov 07 2009 Lucian Langa <cooly at gnome.eu.org> - 1.2.10-1
 - new upstream release