Accepting request 111603 from devel:libraries:c_c++

Minor fixes

OBS-URL: https://build.opensuse.org/request/show/111603
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gsl?expand=0&rev=24
This commit is contained in:
Stephan Kulow 2012-03-29 09:40:42 +00:00 committed by Git OBS Bridge
parent d673ecb754
commit d03a1d24d2
5 changed files with 56 additions and 15 deletions

28
gsl-fsf_address.patch Normal file
View File

@ -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 */

View File

@ -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 Tue Feb 28 11:58:37 UTC 2012 - idonmez@suse.com
- Disable FMA support, see the following message for details: - Disable FMA support, see the following message for details:
http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html
- Still disable %check on i586 because it fails. - Still disable %check on i586 because it fails.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 4 17:19:18 UTC 2012 - jengelh@medozas.de Sat Feb 4 17:19:18 UTC 2012 - jengelh@medozas.de

View File

@ -22,6 +22,7 @@ BuildRequires: blas
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: libtool BuildRequires: libtool
%endif %endif
BuildRequires: libquadmath46
BuildRequires: pkgconfig BuildRequires: pkgconfig
%if 0%{?fedora_version} %if 0%{?fedora_version}
Requires: info Requires: info
@ -36,8 +37,9 @@ Group: Development/Libraries/C and C++
Source: ftp://ftp.gnu.org/pub/gnu/gsl/gsl-%{version}.tar.bz2 Source: ftp://ftp.gnu.org/pub/gnu/gsl/gsl-%{version}.tar.bz2
Patch: gsl-1.6-initvars.diff Patch: gsl-1.6-initvars.diff
Patch5: gsl-wrap.diff Patch5: gsl-wrap.diff
Patch6: qawc-test-x86-precision.diff Patch6: gsl-qawc-test-x86-precision.diff
Patch7: disable-fma.patch Patch7: gsl-disable-fma.patch
Patch8: gsl-fsf_address.patch
Url: http://www.gnu.org/software/gsl/ Url: http://www.gnu.org/software/gsl/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -60,7 +62,7 @@ Numerical Differentiation - Chebyshev Approximation - Series Acceleration -
Discrete Hankel Transforms - Root-Finding - Minimization - Discrete Hankel Transforms - Root-Finding - Minimization -
Least-Squares Fitting - Physical Constants - IEEE Floating-Point Least-Squares Fitting - Physical Constants - IEEE Floating-Point
%package devel %package devel
Summary: GNU Scientific Library - development files Summary: GNU Scientific Library - development files
License: GPL-2.0+ License: GPL-2.0+
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
@ -98,21 +100,23 @@ Least-Squares Fitting - Physical Constants - IEEE Floating-Point
%patch5 -p1 %patch5 -p1
%patch6 %patch6
%patch7 -p1 %patch7 -p1
%patch8
%build %build
autoreconf -fi autoreconf -fi
RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | sed 's/-fstack-protector//'` RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS" | sed 's/-fstack-protector//'`
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ #export CFLAGS="%%{optflags} -fno-strict-aliasing"
%configure --disable-static --with-pic --enable-shared --with-gnu-ld --infodir=%{_infodir} export CFLAGS="%{optflags}"
%configure --disable-static --with-pic --enable-shared --with-gnu-ld
make %{?_smp_mflags} make %{?_smp_mflags}
# latex2html (dvips) is braindead in its rejection of '.' in a dir name # latex2html (dvips) is braindead in its rejection of '.' in a dir name
# the following fails right now, disable it: # the following fails right now, disable it:
#cd .. #cd ..
#mv %{name}-%{version} %{name} #mv %%{name}-%%{version} %%{name}
#cd %{name}/doc #cd %%{name}/doc
#texi2html -l2h -menu -split_chapter -glossary gsl-ref.texi #texi2html -l2h -menu -split_chapter -glossary gsl-ref.texi
#cd ../.. #cd ../..
#mv %{name} %{name}-%{version} #mv %%{name} %{name}-%%{version}
%check %check
%if ! 0%{?qemu_user_space_build} %if ! 0%{?qemu_user_space_build}
@ -120,7 +124,7 @@ make %{?_smp_mflags} check || true
%endif %endif
%install %install
make install DESTDIR=$RPM_BUILD_ROOT %makeinstall
%{__rm} -f %{buildroot}%{_libdir}/*.la %{__rm} -f %{buildroot}%{_libdir}/*.la
%{__rm} -f %{buildroot}%{_infodir}/dir %{__rm} -f %{buildroot}%{_infodir}/dir
@ -131,20 +135,20 @@ make install DESTDIR=$RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libgsl*.so.* %{_libdir}/libgsl*.so.*
/usr/bin/gsl-histogram %{_bindir}/gsl-histogram
/usr/bin/gsl-randist %{_bindir}/gsl-randist
%doc %{_mandir}/man1/gsl-histogram.1.gz %doc %{_mandir}/man1/gsl-histogram.1.gz
%doc %{_mandir}/man1/gsl-randist.1.gz %doc %{_mandir}/man1/gsl-randist.1.gz
%doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO %doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
/usr/include/gsl %{_includedir}/gsl
%{_libdir}/libgsl*.so %{_libdir}/libgsl*.so
%{_libdir}/pkgconfig/gsl.pc %{_libdir}/pkgconfig/gsl.pc
/usr/bin/gsl-config %{_bindir}/gsl-config
#%doc doc/gsl-ref/gsl-ref*.html #%%doc doc/gsl-ref/gsl-ref*.html
/usr/share/aclocal/gsl.m4 %{_datadir}/aclocal/gsl.m4
%doc %{_infodir}/gsl-ref* %doc %{_infodir}/gsl-ref*
%doc %{_mandir}/man1/gsl-config.1.gz %doc %{_mandir}/man1/gsl-config.1.gz
%doc %{_mandir}/man3/gsl.3.gz %doc %{_mandir}/man3/gsl.3.gz