diff --git a/disable-fma.patch b/gsl-disable-fma.patch similarity index 100% rename from disable-fma.patch rename to gsl-disable-fma.patch diff --git a/gsl-fsf_address.patch b/gsl-fsf_address.patch new file mode 100644 index 0000000..b3a8703 --- /dev/null +++ b/gsl-fsf_address.patch @@ -0,0 +1,28 @@ +Index: cdf/gsl_cdf.h +=================================================================== +--- cdf/gsl_cdf.h.orig 2010-12-26 18:57:08.000000000 +0100 ++++ cdf/gsl_cdf.h 2012-03-28 18:06:52.241930192 +0200 +@@ -13,8 +13,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. ++ * along with this program; if not, see http://www.gnu.org/licenses/ + */ + + /* Author: J. Stover */ +Index: specfunc/gsl_sf_mathieu.h +=================================================================== +--- specfunc/gsl_sf_mathieu.h.orig 2010-12-26 18:57:08.000000000 +0100 ++++ specfunc/gsl_sf_mathieu.h 2012-03-28 18:07:46.281645515 +0200 +@@ -13,8 +13,7 @@ + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. ++ * along with this program; if not, see see http://www.gnu.org/licenses/ + */ + + /* Author: L. Johnson */ diff --git a/qawc-test-x86-precision.diff b/gsl-qawc-test-x86-precision.diff similarity index 100% rename from qawc-test-x86-precision.diff rename to gsl-qawc-test-x86-precision.diff diff --git a/gsl.changes b/gsl.changes index 4ee2e40..7518501 100644 --- a/gsl.changes +++ b/gsl.changes @@ -1,9 +1,18 @@ +------------------------------------------------------------------- +Wed Mar 28 18:16:16 CEST 2012 - pth@suse.de + +- Remove the unneccessary -fno-strict-aliasing. +- Replace FSF address in headers by link to the FSF licenses web + page. +- prefix all patch files with a 'gsl-' + ------------------------------------------------------------------- Tue Feb 28 11:58:37 UTC 2012 - idonmez@suse.com - Disable FMA support, see the following message for details: http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html - Still disable %check on i586 because it fails. + ------------------------------------------------------------------- Sat Feb 4 17:19:18 UTC 2012 - jengelh@medozas.de diff --git a/gsl.spec b/gsl.spec index 809cc14..825faff 100644 --- a/gsl.spec +++ b/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