Accepting request 55204 from devel:libraries:c_c++

Accepted submit request 55204 from user msmeissn

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

gsl-1.12.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2887ab91d8e204b4aef905c8ba25852fe99613aa071d184313cd3aada2cce531
-size 2229490

gsl-1.14.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f99068e5bf9e25489444462fb1e6c7cd3a19c0d88d61b7a4548afeaf381abfe
+size 2388942

gsl-wrap.diff

@@ -12,30 +12,6 @@ Index: gsl-1.11/sort/Makefile.am
  test_SOURCES = test.c
  test_LDADD = libgslsort.la ../permutation/libgslpermutation.la ../vector/libgslvector.la ../block/libgslblock.la ../ieee-utils/libgslieeeutils.la ../err/libgslerr.la ../test/libgsltest.la ../sys/libgslsys.la
  
-Index: gsl-1.11/Makefile.in
-===================================================================
---- gsl-1.11.orig/Makefile.in
-+++ gsl-1.11/Makefile.in
-@@ -89,16 +89,16 @@ SCRIPTS = $(bin_SCRIPTS)
- DEFAULT_INCLUDES = -I.@am__isrc@
- depcomp =
- am__depfiles_maybe =
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_$@) $(EXTRA_CFLAGS)
- LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(CFLAGS_$@) $(EXTRA_CFLAGS)
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+	$(LDFLAGS) $(LDFLAGS_$@) $(EXTRA_LDFLAGS) -o $@
- SOURCES = $(libgsl_la_SOURCES) $(gsl_histogram_SOURCES) \
- 	$(gsl_randist_SOURCES)
- DIST_SOURCES = $(libgsl_la_SOURCES) $(gsl_histogram_SOURCES) \
- 	$(gsl_randist_SOURCES)
 Index: gsl-1.11/sort/test_source.c
 ===================================================================
 --- gsl-1.11.orig/sort/test_source.c

gsl.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Dec  8 08:40:55 UTC 2010 - kkaempf@novell.com
+
+- Update to 1.14
+  Bugfixes, improvements and new functions. See NEWS for full list.	    
+
+-------------------------------------------------------------------
+Mon Dec  6 13:51:36 UTC 2010 - kkaempf@novell.com
+
+- Fix build on non-SUSE distros
+
+-------------------------------------------------------------------
+Mon Dec  6 10:30:41 UTC 2010 - kkaempf@novell.com
+
+- Add pkg-config to BuildRequires so pkgconfig(gsl) gets created
+  as provides of the -devel package
+
 -------------------------------------------------------------------
 Thu Feb 11 17:47:24 CET 2010 - rguenther@suse.de
 

gsl.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gsl (Version 1.12)
+# spec file for package gsl (Version 1.14)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -21,7 +21,15 @@
 Name:           gsl
 #BuildRequires:  blas latex2html
 BuildRequires:  blas
-Version:        1.12
+%if 0%{?suse_version}
+BuildRequires:  pkg-config
+%else
+BuildRequires:  pkgconfig
+%endif
+%if 0%{?fedora_version}
+Requires:       info
+%endif
+Version:        1.14
 Release:        2
 License:        GPLv3+
 # NOTE: The package has been update to 1.10+ after all issues with
@@ -76,7 +84,9 @@ License:        GPLv2+
 Summary:        GNU Scientific Library - development files
 Group:          Development/Libraries/C and C++
 Requires:       gsl = %{version} glibc-devel
+%if 0%{?suse_version}
 PreReq:         %{install_info_prereq}
+%endif
 
 %description devel
 This package contains the headers, static libraries and some
@@ -124,7 +134,7 @@ autoreconf -fi
 %build
 RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | sed 's/-fstack-protector//'`
 CFLAGS="$RPM_OPT_FLAGS -O2 -fno-strict-aliasing" \
-%configure --disable-static --with-pic --enable-shared --with-gnu-ld
+%configure --disable-static --with-pic --enable-shared --with-gnu-ld --infodir=%{_infodir}
 make %{?jobs:-j%jobs}
 # latex2html (dvips) is braindead in its rejection of '.' in a dir name
 # the following fails right now, disable it:
@@ -141,6 +151,7 @@ make check
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 %{__rm} -f %{buildroot}%{_libdir}/*.la
+%{__rm} -f %{buildroot}%{_infodir}/dir
 
 %post -p /sbin/ldconfig
 

qawc-test-x86-precision.diff

@@ -1,19 +1,15 @@
-Index: gsl-1.12/integration/test.c
-===================================================================
---- gsl-1.12.orig/integration/test.c
-+++ gsl-1.12/integration/test.c
-@@ -1752,9 +1752,13 @@ int main (void)
-     for (i = 0; i < 6 ; i++) 
+diff -wruN -x '*~' ../orig-gsl-1.14/integration/test.c ./integration/test.c
+--- ../orig-gsl-1.14/integration/test.c	2010-03-10 12:32:48.000000000 +0100
++++ ./integration/test.c	2010-12-08 09:48:11.000000000 +0100
+@@ -1754,7 +1754,11 @@
          gsl_test_rel(w->rlist[i],r[i],1e-14,"qawc(f459) rlist") ;
  
      for (i = 0; i < 6 ; i++) 
--        gsl_test_rel(w->elist[i],e[i],1e-5,"qawc(f459) elist") ;
 +#ifdef __i386__		/* x86 extra FPU precision hurts us here */
-+	gsl_test_rel(w->elist[i],e[i],1e-4,"qawc(f459) elist") ;
+         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");
-