diff --git a/.cvsignore b/.cvsignore index 268e67f..ee6e449 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gsl-1.9.tar.gz +gsl-1.10.tar.gz diff --git a/gsl-1.10-lib64.patch b/gsl-1.10-lib64.patch new file mode 100644 index 0000000..7807732 --- /dev/null +++ b/gsl-1.10-lib64.patch @@ -0,0 +1,48 @@ +--- gsl-1.10/configure.lib64 2007-09-13 17:41:52.000000000 +0200 ++++ gsl-1.10/configure 2007-09-19 09:35:14.000000000 +0200 +@@ -853,6 +853,7 @@ RANLIB + LIBTOOL + GSL_CFLAGS + GSL_LIBS ++GSL_LIB + MINGW32_HOST_TRUE + MINGW32_HOST_FALSE + LIBOBJS +@@ -10333,7 +10334,7 @@ fi + + GSL_CFLAGS="-I$includedir" + GSL_LIBS="-L$libdir -lgsl" +- ++GSL_LIB="-L$libdir" + + + +@@ -13275,6 +13276,7 @@ RANLIB!$RANLIB$ac_delim + LIBTOOL!$LIBTOOL$ac_delim + GSL_CFLAGS!$GSL_CFLAGS$ac_delim + GSL_LIBS!$GSL_LIBS$ac_delim ++GSL_LIB!$GSL_LIB$ac_delim + MINGW32_HOST_TRUE!$MINGW32_HOST_TRUE$ac_delim + MINGW32_HOST_FALSE!$MINGW32_HOST_FALSE$ac_delim + LIBOBJS!$LIBOBJS$ac_delim +@@ -13283,8 +13285,7 @@ HAVE_GNUM68K_IEEE_INTERFACE!$HAVE_GNUM68 + HAVE_GNUPPC_IEEE_INTERFACE!$HAVE_GNUPPC_IEEE_INTERFACE$ac_delim + HAVE_GNUX86_IEEE_INTERFACE!$HAVE_GNUX86_IEEE_INTERFACE$ac_delim + _ACEOF +- +- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then ++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 98; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +--- gsl-1.10/gsl-config.in.lib64 2007-09-19 09:21:20.000000000 +0200 ++++ gsl-1.10/gsl-config.in 2007-09-19 09:21:20.000000000 +0200 +@@ -63,7 +63,7 @@ while test $# -gt 0; do + + --libs) + : ${GSL_CBLAS_LIB=-lgslcblas} +- echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm | sed "s|-L/usr/lib||g" ++ echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm | sed "s|@GSL_LIB@||g" + ;; + + --libs-without-cblas) diff --git a/gsl-1.9-lib64.patch b/gsl-1.9-lib64.patch deleted file mode 100644 index 277ab02..0000000 --- a/gsl-1.9-lib64.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- gsl-1.9/configure.lib 2007-02-20 14:09:19.000000000 +0100 -+++ gsl-1.9/configure 2007-05-22 11:07:28.000000000 +0200 -@@ -459,7 +459,7 @@ - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GSL_LT_VERSION GSL_LT_CBLAS_VERSION RELEASED build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB LIBTOOL GSL_CFLAGS GSL_LIBS HAVE_INLINE LIBOBJS HAVE_PRINTF_LONGDOUBLE HAVE_EXTENDED_PRECISION_REGISTERS HAVE_GNUSPARC_IEEE_INTERFACE HAVE_GNUM68K_IEEE_INTERFACE HAVE_GNUPPC_IEEE_INTERFACE HAVE_GNUX86_IEEE_INTERFACE HAVE_SUNOS4_IEEE_INTERFACE HAVE_SOLARIS_IEEE_INTERFACE HAVE_HPUX11_IEEE_INTERFACE HAVE_HPUX_IEEE_INTERFACE HAVE_TRU64_IEEE_INTERFACE HAVE_IRIX_IEEE_INTERFACE HAVE_AIX_IEEE_INTERFACE HAVE_FREEBSD_IEEE_INTERFACE HAVE_OS2EMX_IEEE_INTERFACE HAVE_NETBSD_IEEE_INTERFACE HAVE_OPENBSD_IEEE_INTERFACE HAVE_DARWIN_IEEE_INTERFACE HAVE_DARWIN86_IEEE_INTERFACE HAVE_IEEE_COMPARISONS HAVE_IEEE_DENORMALS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT GSL_LT_VERSION GSL_LT_CBLAS_VERSION RELEASED build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB LIBTOOL GSL_CFLAGS GSL_LIBS GSL_LIB HAVE_INLINE LIBOBJS HAVE_PRINTF_LONGDOUBLE HAVE_EXTENDED_PRECISION_REGISTERS HAVE_GNUSPARC_IEEE_INTERFACE HAVE_GNUM68K_IEEE_INTERFACE HAVE_GNUPPC_IEEE_INTERFACE HAVE_GNUX86_IEEE_INTERFACE HAVE_SUNOS4_IEEE_INTERFACE HAVE_SOLARIS_IEEE_INTERFACE HAVE_HPUX11_IEEE_INTERFACE HAVE_HPUX_IEEE_INTERFACE HAVE_TRU64_IEEE_INTERFACE HAVE_IRIX_IEEE_INTERFACE HAVE_AIX_IEEE_INTERFACE HAVE_FREEBSD_IEEE_INTERFACE HAVE_OS2EMX_IEEE_INTERFACE HAVE_NETBSD_IEEE_INTERFACE HAVE_OPENBSD_IEEE_INTERFACE HAVE_DARWIN_IEEE_INTERFACE HAVE_DARWIN86_IEEE_INTERFACE HAVE_IEEE_COMPARISONS HAVE_IEEE_DENORMALS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -9612,7 +9612,7 @@ - - GSL_CFLAGS="-I$includedir" - GSL_LIBS="-L$libdir -lgsl" -- -+GSL_LIB="-L$libdir" - - - -@@ -12484,6 +12484,7 @@ - s,@LIBTOOL@,$LIBTOOL,;t t - s,@GSL_CFLAGS@,$GSL_CFLAGS,;t t - s,@GSL_LIBS@,$GSL_LIBS,;t t -+s,@GSL_LIB@, $GSL_LIB,;t t - s,@HAVE_INLINE@,$HAVE_INLINE,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@HAVE_PRINTF_LONGDOUBLE@,$HAVE_PRINTF_LONGDOUBLE,;t t ---- gsl-1.9/gsl-config.in.lib 2007-05-22 11:05:57.000000000 +0200 -+++ gsl-1.9/gsl-config.in 2007-05-22 11:06:32.000000000 +0200 -@@ -63,7 +63,7 @@ - - --libs) - : ${GSL_CBLAS_LIB=-lgslcblas} -- echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm | sed "s|-L/usr/lib||g" -+ echo @GSL_LIBS@ $GSL_CBLAS_LIB -lm | sed "s|@GSL_LIB@||g" - ;; - - --libs-without-cblas) diff --git a/gsl.spec b/gsl.spec index 54a76a2..8e42aa6 100644 --- a/gsl.spec +++ b/gsl.spec @@ -5,7 +5,7 @@ Release: 1%{?dist} URL: http://sources.redhat.com/gsl/ Source: ftp://sources.redhat.com/pub/gsl/%{name}-%{version}.tar.gz Patch0: gsl-1.1-nousr.patch -Patch1: gsl-1.9-lib64.patch +Patch1: gsl-1.10-lib64.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 @@ -98,6 +98,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* 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 diff --git a/sources b/sources index b4860f5..f80291f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -81dca4362ae8d2aa1547b7d010881e43 gsl-1.9.tar.gz +faf5e178855ec952fe745a03d815da1d gsl-1.10.tar.gz