Accepting request 111603 from devel:libraries:c_c++

Minor fixes

OBS-URL: https://build.opensuse.org/request/show/111603
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gsl?expand=0&rev=24

gsl.spec

@@ -22,6 +22,7 @@ BuildRequires:  blas
 %if 0%{?suse_version}
 BuildRequires:  libtool
 %endif
+BuildRequires:  libquadmath46
 BuildRequires:  pkgconfig
 %if 0%{?fedora_version}
 Requires:       info
@@ -36,8 +37,9 @@ Group:          Development/Libraries/C and C++
 Source:         ftp://ftp.gnu.org/pub/gnu/gsl/gsl-%{version}.tar.bz2
 Patch:          gsl-1.6-initvars.diff
 Patch5:         gsl-wrap.diff
-Patch6:         qawc-test-x86-precision.diff
-Patch7:         disable-fma.patch
+Patch6:         gsl-qawc-test-x86-precision.diff
+Patch7:         gsl-disable-fma.patch
+Patch8:         gsl-fsf_address.patch
 Url:            http://www.gnu.org/software/gsl/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -60,7 +62,7 @@ Numerical Differentiation - Chebyshev Approximation - Series Acceleration -
 Discrete Hankel Transforms - Root-Finding - Minimization - 
 Least-Squares Fitting - Physical Constants - IEEE Floating-Point
 
-%package devel
+%package        devel
 Summary:        GNU Scientific Library - development files
 License:        GPL-2.0+
 Group:          Development/Libraries/C and C++
@@ -98,21 +100,23 @@ Least-Squares Fitting - Physical Constants - IEEE Floating-Point
 %patch5 -p1
 %patch6 
 %patch7 -p1
+%patch8
 
 %build
 autoreconf -fi
 RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | sed 's/-fstack-protector//'`
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
-%configure --disable-static --with-pic --enable-shared --with-gnu-ld --infodir=%{_infodir}
+#export CFLAGS="%%{optflags} -fno-strict-aliasing"
+export CFLAGS="%{optflags}"
+%configure --disable-static --with-pic --enable-shared --with-gnu-ld
 make %{?_smp_mflags}
 # latex2html (dvips) is braindead in its rejection of '.' in a dir name
 # the following fails right now, disable it:
 #cd ..
-#mv %{name}-%{version} %{name}
-#cd %{name}/doc
+#mv %%{name}-%%{version} %%{name}
+#cd %%{name}/doc
 #texi2html -l2h -menu -split_chapter -glossary gsl-ref.texi
 #cd ../..
-#mv %{name} %{name}-%{version}
+#mv %%{name} %{name}-%%{version}
 
 %check
 %if ! 0%{?qemu_user_space_build}
@@ -120,7 +124,7 @@ make %{?_smp_mflags} check || true
 %endif
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%makeinstall
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 %{__rm} -f %{buildroot}%{_infodir}/dir
 
@@ -131,20 +135,20 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_libdir}/libgsl*.so.*
-/usr/bin/gsl-histogram
-/usr/bin/gsl-randist
+%{_bindir}/gsl-histogram
+%{_bindir}/gsl-randist
 %doc %{_mandir}/man1/gsl-histogram.1.gz
 %doc %{_mandir}/man1/gsl-randist.1.gz
 %doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
 
 %files devel
 %defattr(-,root,root)
-/usr/include/gsl
+%{_includedir}/gsl
 %{_libdir}/libgsl*.so
 %{_libdir}/pkgconfig/gsl.pc
-/usr/bin/gsl-config
-#%doc doc/gsl-ref/gsl-ref*.html
-/usr/share/aclocal/gsl.m4
+%{_bindir}/gsl-config
+#%%doc doc/gsl-ref/gsl-ref*.html
+%{_datadir}/aclocal/gsl.m4
 %doc %{_infodir}/gsl-ref*
 %doc %{_mandir}/man1/gsl-config.1.gz
 %doc %{_mandir}/man3/gsl.3.gz