rpms/hamlib/F-9 hamlib.spec,1.36,1.37

[Steve Conklin (sconklin)]

Author: sconklin

Update of /cvs/pkgs/rpms/hamlib/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11114

Modified Files:
	hamlib.spec 
Log Message:
Applied Paul Howarth's patch to the spec file



Index: hamlib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hamlib/F-9/hamlib.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- hamlib.spec	7 Jul 2008 16:58:07 -0000	1.36
+++ hamlib.spec	7 Jul 2008 17:46:31 -0000	1.37
@@ -2,7 +2,7 @@
 
 Name:           hamlib
 Version:        1.2.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Run-time library to control radio transceivers and receivers
 
 Group:          System Environment/Libraries
@@ -68,6 +68,7 @@
 Summary: Hamlib radio control library Perl binding
 Group: Development/Libraries
 Requires: hamlib = %{version}-%{release}
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 Hamlib PERL Language bindings to allow radio control from PERL scripts.
@@ -100,6 +101,9 @@
         --with-python-binding \
         --with-perl-binding
 
+# Avoid RPATHs on x86_64
+sed -i.rpath -e 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="%{_lib} %{_libdir}|' libtool
+
 # Build libs, drivers, and programs, won't build with smpflags
 make
 # Build Documentation
@@ -111,7 +115,7 @@
 #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 
+        do install -m 0644 doc/html/$f $RPM_BUILD_ROOT%{_docdir}/%{name}/html/$f 
 done
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/hamlib-*.a $RPM_BUILD_ROOT%{_libdir}/hamlib-*.la
@@ -169,6 +173,7 @@
 %{_libdir}/pkgconfig/hamlib.pc
 
 %files doc
+%defattr(-, root, root)
 %doc %{_docdir}/%{name}
 
 %files c++
@@ -186,7 +191,8 @@
 %files perl
 %defattr(-, root, root)
 %doc COPYING.LIB
-%{perl_vendorarch}/*
+%{perl_vendorarch}/auto/Hamlib/
+%{perl_vendorarch}/Hamlib.pm
 
 %files python
 %defattr(-, root, root)
@@ -199,6 +205,9 @@
 %{_libdir}/hamlibtcl*
 
 %changelog
+* Mon Jul  7 2008 Steve Conklin <fedora at conklinhouse.com> - 1.2.7-3
+- Applied suggested patch from Paul Howarth (thanks)
+
 * Mon Jul  7 2008 Steve Conklin <fedora at conklinhouse.com> - 1.2.7-2
 - Rebuild to satisfy Perl dependency, add dependency