Hello community,
here is the log from the commit of package gsl for openSUSE:Factory checked in
at 2012-03-29 11:40:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gsl (Old)
and /work/SRC/openSUSE:Factory/.gsl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gsl", Maintainer is "p...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gsl/gsl.changes 2012-03-28 00:01:10.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.gsl.new/gsl.changes 2012-03-29
11:40:43.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Mar 28 18:16:16 CEST 2012 - p...@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-'
+
+-------------------------------------------------------------------
@@ -6,0 +15 @@
+
Old:
----
disable-fma.patch
qawc-test-x86-precision.diff
New:
----
gsl-disable-fma.patch
gsl-fsf_address.patch
gsl-qawc-test-x86-precision.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gsl.spec ++++++
--- /var/tmp/diff_new_pack.pHV1Aj/_old 2012-03-29 11:40:45.000000000 +0200
+++ /var/tmp/diff_new_pack.pHV1Aj/_new 2012-03-29 11:40:45.000000000 +0200
@@ -22,6 +22,7 @@
%if 0%{?suse_version}
BuildRequires: libtool
%endif
+BuildRequires: libquadmath46
BuildRequires: pkgconfig
%if 0%{?fedora_version}
Requires: info
@@ -36,8 +37,9 @@
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
@@ -98,21 +100,23 @@
%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 @@
%endif
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+%makeinstall
%{__rm} -f %{buildroot}%{_libdir}/*.la
%{__rm} -f %{buildroot}%{_infodir}/dir
@@ -131,20 +135,20 @@
%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
++++++ gsl-disable-fma.patch ++++++
Index: gsl-1.15/configure.ac
===================================================================
--- gsl-1.15.orig/configure.ac
+++ gsl-1.15/configure.ac
@@ -381,6 +381,30 @@ AC_SUBST(HAVE_OPENBSD_IEEE_INTERFACE)
AC_SUBST(HAVE_DARWIN_IEEE_INTERFACE)
AC_SUBST(HAVE_DARWIN86_IEEE_INTERFACE)
+dnl check for compiler flags to disable use of FMA
+save_cflags="$CFLAGS"
+AC_CACHE_CHECK([for compiler flags to disable use of FMA], ac_cv_c_fma_flags,
+[
+if test X"$GCC" = Xyes; then
+ fma_flags='-ffp-contract=off'
+else
+ fma_flags=
+fi
+if test X"$fma_flags" != X; then
+ CFLAGS="$fma_flags $CFLAGS"
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[int
+foo;]])],[ac_cv_c_fma_flags="$fma_flags"],[ac_cv_c_fma_flags="none"])
+else
+ ac_cv_c_fma_flags="none"
+fi])
+
+if test "$ac_cv_c_fma_flags" != "none" ; then
+ CFLAGS="$ac_cv_c_fma_flags $save_cflags"
+else
+ CFLAGS="$save_cflags"
+fi
+
+
dnl Check for IEEE control flags
save_cflags="$CFLAGS"
++++++ gsl-fsf_address.patch ++++++
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 */
++++++ gsl-qawc-test-x86-precision.diff ++++++
--- integration/test.c.orig
+++ integration/test.c
@@ -1754,7 +1754,11 @@ int main (void)
gsl_test_rel(w->rlist[i],r[i],1e-14,"qawc(f459) rlist") ;
for (i = 0; i < 6 ; i++)
+#ifdef __i386__ /* x86 extra FPU precision hurts us here */
gsl_test_rel(w->elist[i],e[i],1e-4,"qawc(f459) elist") ;
+#else
+ gsl_test_rel(w->elist[i],e[i],1e-5,"qawc(f459) elist") ;
+#endif
for (i = 0; i < 6 ; i++)
gsl_test_int((int)w->order[i],order[i]-1,"qawc(f459) order");
--- configure.ac.orig
+++ configure.ac
@@ -87,7 +87,9 @@ AC_CANONICAL_HOST
dnl Checks for programs.
AC_LANG(C)
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
