- fix multilib problem

This commit is contained in:
Ivana Varekova 2006-03-03 12:28:38 +00:00
parent a4f438d3b8
commit eb1e0e3110

View File

@ -1,7 +1,7 @@
Summary: The GNU Scientific Library for numerical analysis. Summary: The GNU Scientific Library for numerical analysis.
Name: gsl Name: gsl
Version: 1.7 Version: 1.7
Release: 1.2.1 Release: 2
URL: http://sources.redhat.com/gsl/ URL: http://sources.redhat.com/gsl/
Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz
Patch0: gsl-1.1-nousr.patch 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%{_sysconfdir}
rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig 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 %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
@ -71,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING %doc AUTHORS COPYING
%{_bindir}/gsl-config %{_bindir}/gsl-config*
%{_datadir}/aclocal/* %{_datadir}/aclocal/*
%{_includedir}/* %{_includedir}/*
%{_infodir}/*info* %{_infodir}/*info*
@ -79,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so %{_libdir}/*.so
%changelog %changelog
* Fri Mar 3 2006 Ivana Varekova <varekova@redhat.com> - 1.7-2
- fix multilib problem
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.7-1.2.1 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.7-1.2.1
- bump again for double-long bug on ppc(64) - bump again for double-long bug on ppc(64)