diff --git a/gsl-1.16-atlas.patch b/gsl-1.16-atlas.patch deleted file mode 100644 index 3c8f14d..0000000 --- a/gsl-1.16-atlas.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gsl-1.16/Makefile.in.atlas gsl-1.16/Makefile.in ---- gsl-1.16/Makefile.in.atlas 2013-10-01 21:22:11.799235274 -0600 -+++ gsl-1.16/Makefile.in 2013-10-01 21:26:59.692672947 -0600 -@@ -145,7 +145,7 @@ am__v_lt_0 = --silent - am__v_lt_1 = - libgsl_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libgsl_la_LDFLAGS) $(LDFLAGS) -o $@ -+ $(libgsl_la_LDFLAGS) $(LDFLAGS) -lsatlas -o $@ - PROGRAMS = $(bin_PROGRAMS) - am_gsl_histogram_OBJECTS = gsl-histogram.$(OBJEXT) - gsl_histogram_OBJECTS = $(am_gsl_histogram_OBJECTS) diff --git a/gsl.spec b/gsl.spec index 3dc027d..0fe7c1b 100644 --- a/gsl.spec +++ b/gsl.spec @@ -1,12 +1,11 @@ Summary: The GNU Scientific Library for numerical analysis Name: gsl Version: 1.16 -Release: 11%{?dist} +Release: 12%{?dist} URL: http://www.gnu.org/software/gsl/ Source: ftp://ftp.gnu.org/gnu/gsl/%{name}-%{version}.tar.gz Patch0: gsl-1.10-lib64.patch Patch1: gsl-1.14-link.patch -Patch2: gsl-1.16-atlas.patch # info part of this package is under GFDL license # eigen/nonsymmv.c and eigen/schur.c # contains rutiens which are part of LAPACK - under BSD style license @@ -14,7 +13,6 @@ License: GPLv3 and GFDL and BSD Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig -BuildRequires: atlas-devel >= 3.10 %description The GNU Scientific Library (GSL) is a collection of routines for @@ -36,7 +34,6 @@ developing programs using the GSL (GNU Scientific Library). %setup -q %patch0 -p1 -b .lib64 %patch1 -p1 -b .libs -%patch2 -p1 -b .atlas iconv -f windows-1252 -t utf-8 THANKS > THANKS.aux touch -r THANKS THANKS.aux mv THANKS.aux THANKS @@ -45,7 +42,7 @@ mv THANKS.aux THANKS %configure CFLAGS="$CFLAGS -fgnu89-inline" sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} LDFLAGS="$LDFLAGS -L%{_libdir}/atlas/" +make %{?_smp_mflags} %check export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH @@ -98,7 +95,12 @@ fi %{_mandir}/man3/*.3* %changelog -* Tue Oct 1 2013 Orion Poplawski - 1.16-1 +* Sat Feb 15 2014 Susi Lehtola - 1.16-12 +- Drop ATLAS linkage patch: by design, the CBLAS library must be + defined at link time to allow use of more optimized implementations. + (BZ #1007058). + +* Tue Oct 1 2013 Orion Poplawski - 1.16-11 - Update to 1.16 - Rebase atlas patch - Drop upstreamed ode patch @@ -206,158 +208,3 @@ fi - add pkgconfig dependency - separate static libraries to -static subpackage - fix gsl-config script - thanks Patrice Dumas - -* Tue Sep 23 2007 Ivana Varekova - 1.10-3 -- remove *.la files -- add pkgconfig configure file -- change source -- spec file cleanup - -* Wed Sep 19 2007 Ivana Varekova - 1.10-2 -- update license tag - -* Wed Sep 19 2007 Ivana Varekova - 1.10-1 -- update to 1.10 -- change license tag - -* Tue May 22 2007 Ivana Varekova - 1.9-1 -- update to 1.9 - -* Wed Mar 14 2007 Ivana Varekova - 1.8-3 -- incorporate the package review feedback - -* Mon Jan 22 2007 Ivana Varekova - 1.8-2 -- Resolves: 223700 - fix non-failsafe install-info problem -- spec file cleanup - -* Wed Jul 12 2006 Jesse Keating - 1.8-1.1 -- rebuild - -* Fri May 5 2006 Ivana Varekova - 1.8-1 -- update to 1.8 - -* 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) - -* Tue Feb 07 2006 Jesse Keating - 1.7-1.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Thu Nov 10 2005 Ivana Varekova 1.7-1 -- update to 1.7 - -* Mon Mar 7 2005 Ivana Varekova 1.6-2 -- rebuilt - -* Thu Jan 6 2005 Ivana Varekova 1.6-1 -- update to 1.6 - -* Wed Dec 15 2004 Ivana Varekova -- fix bug #142696 gsl-config outputs invalid flags on multilib 64-bit -architectures - -* Fri Jul 02 2004 Florian La Roche -- 1.5 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Thu Aug 21 2003 Florian La Roche -- update to 1.4 - -* Wed Jun 25 2003 Florian La Roche -- update to 1.3 - -* Wed Jun 04 2003 Elliot Lee -- rebuilt - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Fri Nov 29 2002 Tim Powers 1.1.1-4 -- remove unpackaged files from the buildroot - -* Fri Jun 21 2002 Tim Powers -- automated rebuild - -* Thu May 23 2002 Tim Powers -- automated rebuild - -* Thu Mar 21 2002 Trond Eivind Glomsrød -- 1.1.1 bugfix release -- Stop the gsl-config script from printing -I/usr/include - and -L/usr/lib (#59500) - - -* Wed Feb 27 2002 Trond Eivind Glomsrød 1.1-1 -- 1.1 -- Update URL and location - -* Wed Jan 09 2002 Tim Powers -- automated rebuild - -* Thu Dec 13 2001 Trond Eivind Glomsrød 1.0-1 -- 1.0 -- Split into gsl and gsl-devel -- update description (#56926) - -* Thu Jul 19 2001 Preston Brown -- upgrade to 0.9 - -* Sun Jun 24 2001 Elliot Lee -- Bump release + rebuild. - -* Thu Jan 18 2001 Preston Brown -- prereq install-info (#24250) - -* Mon Dec 11 2000 Preston Brown -- 0.7, remove excludearch for ia64 - -* Sun Jul 30 2000 Florian La Roche -- fix %%post to be a real shell and add ldconfig to %%post - -* Thu Jul 13 2000 Prospector -- automatic rebuild - -* Mon Jun 19 2000 Preston Brown -- don't include the info dir file... - -* Sat Jun 17 2000 Bill Nottingham -- add %%defattr - -* Mon Jun 12 2000 Preston Brown -- 0.6, FHS paths -- exclude ia64, it is having issues - -* Sun Mar 21 1999 Cristian Gafton -- auto rebuild in the new build environment (release 2) - -* Thu Mar 11 1999 Bill Nottingham -- update to 0.3f -- add patches to fix glibc-2.1 compilation, doc oddity - -* Thu Feb 25 1999 Bill Nottingham -- new summary/description, work around automake oddity - -* Tue Jan 12 1999 Michael K. Johnson -- libtoolize for arm - -* Thu Sep 10 1998 Cristian Gafton -- spec file fixups - -* Sat May 9 1998 Michael Fulbright -- started with package for gmp from Toshio Kuratomi -- cleaned up file list -- fixed up install-info support