From eb1e0e31107516f3d9455f605383a6a870fb145f Mon Sep 17 00:00:00 2001 From: Ivana Varekova Date: Fri, 3 Mar 2006 12:28:38 +0000 Subject: [PATCH] - fix multilib problem --- gsl.spec | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gsl.spec b/gsl.spec index 223c43d..facbd45 100644 --- a/gsl.spec +++ b/gsl.spec @@ -1,7 +1,7 @@ Summary: The GNU Scientific Library for numerical analysis. Name: gsl Version: 1.7 -Release: 1.2.1 +Release: 2 URL: http://sources.redhat.com/gsl/ Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz Patch0: gsl-1.1-nousr.patch @@ -45,6 +45,20 @@ rm -rf $RPM_BUILD_ROOT%{_mandir} rm -rf $RPM_BUILD_ROOT%{_sysconfdir} rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig +gslcsuffix=`echo "%{_libdir}" | sed s,/usr/,,` +mv $RPM_BUILD_ROOT%{_bindir}/gsl-config $RPM_BUILD_ROOT%{_bindir}/gsl-config-$gslcsuffix +cat > $RPM_BUILD_ROOT%{_bindir}/gsl-config << EOF +#!/bin/sh +if [ -e %{_bindir}/gsl-config-lib64 ]; then + exec %{_bindir}/gsl-config-lib64 "\$@" +elif [ -e %{_bindir}/gsl-config-* ]; then + gslcfile="\`ls %{_bindir}/gsl-config-* | head -n1\`" + exec \$gslcfile "\$@" +fi +EOF +chmod 755 $RPM_BUILD_ROOT%{_bindir}/gsl-config + + %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -71,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root) %doc AUTHORS COPYING -%{_bindir}/gsl-config +%{_bindir}/gsl-config* %{_datadir}/aclocal/* %{_includedir}/* %{_infodir}/*info* @@ -79,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Fri Mar 3 2006 Ivana Varekova - 1.7-2 +- fix multilib problem + * Fri Feb 10 2006 Jesse Keating - 1.7-1.2.1 - bump again for double-long bug on ppc(64)