rpms/hamlib/F-11 hamlib.spec,1.38,1.39

[Lucian Langa]

Author: lucilanga

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

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


Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/F-11/hamlib.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- hamlib.spec	1 Apr 2009 17:19:13 -0000	1.38
+++ hamlib.spec	11 Mar 2010 18:25:04 -0000	1.39
@@ -2,7 +2,7 @@
 
 Name:           hamlib
 Version:        1.2.8
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
@@ -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 \
         --with-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
@@ -109,9 +113,12 @@ make -C doc doc
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 #install documentation
-mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}/html
-for f in `ls doc/html/`
-	do install -m 0644 doc/html/$f $RPM_BUILD_ROOT%{_docdir}/%{name}/html/$f 
+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`
+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`
 done
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la
@@ -149,7 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc AUTHORS ChangeLog PLAN COPYING.LIB COPYING README THANKS TODO
 %{_bindir}/*
 %{_sbindir}/*
@@ -158,7 +165,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/*
 
 %files devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc README.developer
 %{_libdir}/libhamlib.so
 %{_datadir}/aclocal/hamlib.m4
@@ -171,6 +178,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/hamlib.pc
 
 %files doc
+%defattr(-, root, root, -)
 %doc %{_docdir}/%{name}
 
 %files c++
@@ -179,30 +187,36 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libhamlib++.so.*
 
 %files c++-devel
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING.LIB
 %{_libdir}/libhamlib++.so
 %{_includedir}/hamlib/rigclass.h
 %{_includedir}/hamlib/rotclass.h
 
 %files perl
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING.LIB
 %{perl_vendorarch}/*
 
 %files python
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING.LIB
 %{python_sitelib}/*.py*
 %{python_sitelib}/_Hamlib.so
 
 
 %files tcl
-%defattr(-, root, root)
+%defattr(-, root, root, -)
 %doc COPYING.LIB
 %{_libdir}/hamlibtcl*
 
 %changelog
+* Thu Mar 11 2010 Lucian Langa <cooly at gnome.eu.org> - 1.2.8-4
+- kill rpath
+- use system ltdl (#563975)
+- fix documents install
+- misc cleanups
+
 * Wed Apr 01 2009 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 1.2.8-3
 - Add hackish fix for python binding issue