diff --git a/.gitignore b/.gitignore index 47e55c0..b36c4c3 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ octave-3.2.4.tar.bz2 /octave-4.0.0.tar.xz /octave-4.0.1.tar.xz /octave-4.0.2.tar.xz +/octave-4.0.3.tar.xz diff --git a/octave-signbit.patch b/octave-signbit.patch deleted file mode 100644 index 00d4df8..0000000 --- a/octave-signbit.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up octave-4.0.1/libgnu/math.in.h.signbit octave-4.0.1/libgnu/math.in.h ---- octave-4.0.1/libgnu/math.in.h.signbit 2015-05-14 01:31:01.000000000 -0600 -+++ octave-4.0.1/libgnu/math.in.h 2016-03-23 17:34:43.719131933 -0600 -@@ -1,6 +1,6 @@ - /* A GNU-like . - -- Copyright (C) 2002-2003, 2007-2015 Free Software Foundation, Inc. -+ Copyright (C) 2002-2003, 2007-2016 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -2205,7 +2205,8 @@ _GL_WARN_REAL_FLOATING_DECL (isnan); - - - #if @GNULIB_SIGNBIT@ --# if @REPLACE_SIGNBIT_USING_GCC@ -+# if (@REPLACE_SIGNBIT_USING_GCC@ \ -+ && (!defined __cplusplus || __cplusplus < 201103L)) - # undef signbit - /* GCC 4.0 and newer provides three built-ins for signbit. */ - # define signbit(x) \ diff --git a/octave.spec b/octave.spec index 1f9fd35..cfd059d 100644 --- a/octave.spec +++ b/octave.spec @@ -15,8 +15,8 @@ Name: octave Epoch: 6 -Version: 4.0.2 -Release: 3%{?dist} +Version: 4.0.3 +Release: 1%{?dist} Summary: A high-level language for numerical computations Group: Applications/Engineering License: GPLv3+ @@ -36,9 +36,6 @@ Patch0: octave-pkgbuilddir.patch # Remove project_group from appdata.xml file # https://bugzilla.redhat.com/show_bug.cgi?id=1293561 Patch2: octave-appdata.patch -# Fix gnulib signbit for g++ 6 -# https://bugzilla.redhat.com/show_bug.cgi?id=1276893 -Patch3: octave-signbit.patch # Add needed #include to bring in gnulib Patch4: octave-gnulib.patch # Handle g++ 6 abs() change @@ -170,7 +167,6 @@ This package contains documentation for Octave. %setup -q -n %{name}-%{version}%{?rctag} %patch0 -p1 -b .pkgbuilddir %patch2 -p1 -b .appdata -%patch3 -p1 -b .signbit %patch4 -p1 -b .gnulib %patch5 -p1 -b .abs %patch6 -p1 -b .term @@ -407,6 +403,9 @@ fi %{_pkgdocdir}/refcard*.pdf %changelog +* Sun Jul 3 2016 Orion Poplawski - 6:4.0.3-1 +- Update to 4.0.3 + * Wed Jun 29 2016 Orion Poplawski - 6:4.0.2-3 - Rebuild for hdf5 1.8.17 diff --git a/sources b/sources index fe50f0b..f74b1e9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -646f397dac770d41448870ac3ba9e3b9 octave-4.0.2.tar.xz +73b140bc69ac21cfaa3e473b91b6842b octave-4.0.3.tar.xz