From 4bd4b4e018fad88dc09b3ac59e8efea02cc59cbc Mon Sep 17 00:00:00 2001
From: Ivana Varekova <varekova@fedoraproject.org>
Date: Tue, 23 Oct 2007 11:09:30 +0000
Subject: [PATCH] incorporate Merge Review comments (225863): - remove *.la
 files - add pkgconfig configure file - change source - spec file cleanup

---
 gsl.spec | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/gsl.spec b/gsl.spec
index ae4a832..51a5717 100644
--- a/gsl.spec
+++ b/gsl.spec
@@ -1,9 +1,9 @@
 Summary: The GNU Scientific Library for numerical analysis
 Name: gsl
 Version: 1.10
-Release: 2%{?dist}
-URL: http://sources.redhat.com/gsl/
-Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz
+Release: 3%{?dist}
+URL: http://www.gnu.org/software/gsl/
+Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz
 Patch0: gsl-1.1-nousr.patch
 Patch1: gsl-1.10-lib64.patch
 # info part of this package is under GFDL license
@@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The GNU Scientific Library (GSL) is a collection of routines for
-numerical analysis, written in C
+numerical analysis, written in C.
 
 %package devel
 Summary: Static libraries and header files for GSL development
@@ -48,12 +48,15 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 rm -rf $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}
-rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
 
-gslcsuffix=`echo "%{_libdir}" | sed s,/usr/,,`
+gslcsuffix=`echo "%{_lib}" `
 mv $RPM_BUILD_ROOT%{_bindir}/gsl-config $RPM_BUILD_ROOT%{_bindir}/gsl-config-$gslcsuffix
 cat > $RPM_BUILD_ROOT%{_bindir}/gsl-config << EOF
 #!/bin/sh
+# this construction is necessary to avoid a multilib problem
+# if a 64 bit version of gsl is installed, it will be used,
+# otherwise a 32 bit version will be linked
 if [ -e %{_bindir}/gsl-config-lib64 ]; then
   exec %{_bindir}/gsl-config-lib64 "\$@"
 elif [ -e %{_bindir}/gsl-config-* ]; then
@@ -80,10 +83,9 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
 %{_libdir}/*so.*
-%{_libdir}/*.la
 %{_bindir}/gsl-histogram
 %{_bindir}/gsl-randist
 
@@ -96,8 +98,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/*info*
 %{_libdir}/*.a
 %{_libdir}/*.so
+%{_libdir}/pkgconfig/gsl.pc
 
 %changelog
+* Tue Sep 23 2007 Ivana Varekova <varekova@redhat.com> - 1.10-3
+- remove *.la files
+- add pkgconfig configure file
+- change source
+- spec file cleanup
+
 * Wed Sep 19 2007 Ivana Varekova <varekova@redhat.com> - 1.10-2
 - update license tag