diff --git a/.gitignore b/.gitignore
index 96cfe0d..845c3c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ octave-3.2.4.tar.bz2
/octave-4.0.3.tar.xz
/octave-4.2.0-rc1.tar.xz
/octave-4.2.0.tar.lz
+/octave-4.2.1.tar.lz
diff --git a/octave-appdata.patch b/octave-appdata.patch
index 52cace3..a10fa7f 100644
--- a/octave-appdata.patch
+++ b/octave-appdata.patch
@@ -1,17 +1,9 @@
---- octave-4.2.0/etc/icons/octave.appdata.xml.in.appdata 2016-11-13 16:16:10.000000000 +0100
-+++ octave-4.2.0/etc/icons/octave.appdata.xml.in 2016-12-29 14:54:32.389932341 +0100
-@@ -17,7 +17,7 @@
- -->
-
- %OCTAVE_DESKTOP_FILE%
-- GPLv3+
-+ GPL-3.0+
- GNU Octave
- Interactive programming environment for numerical computations
-
-@@ -52,5 +52,4 @@
-
+diff -up octave-4.2.1/etc/icons/octave.appdata.xml.in.appdata octave-4.2.1/etc/icons/octave.appdata.xml.in
+--- octave-4.2.1/etc/icons/octave.appdata.xml.in.appdata 2017-02-24 20:46:50.581334701 -0700
++++ octave-4.2.1/etc/icons/octave.appdata.xml.in 2017-02-24 20:47:29.866515768 -0700
+@@ -58,5 +58,4 @@
+
http://www.octave.org
- maintainers@octave.org
+ maintainers@octave.org
- GNU
-
+
diff --git a/octave-gzip.patch b/octave-gzip.patch
deleted file mode 100644
index a63f710..0000000
--- a/octave-gzip.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- libinterp/dldfcn/gzip.cc.orig 2016-11-13 08:16:10.000000000 -0700
-+++ libinterp/dldfcn/gzip.cc 2016-12-03 07:30:58.000000000 -0700
-@@ -348,14 +348,18 @@
- unsigned char buf_in[buf_len];
- unsigned char buf_out[buf_len];
-
-- while ((strm->avail_in = std::fread (buf_in, sizeof (buf_in[0]),
-- buf_len, source.fp)) != 0)
-+ int flush;
-+
-+ do
- {
-+ strm->avail_in = std::fread (buf_in, sizeof (buf_in[0]),
-+ buf_len, source.fp);
-+
- if (std::ferror (source.fp))
- throw std::runtime_error ("failed to read source file");
-
- strm->next_in = buf_in;
-- const int flush = std::feof (source.fp) ? Z_FINISH : Z_NO_FLUSH;
-+ flush = std::feof (source.fp) ? Z_FINISH : Z_NO_FLUSH;
-
- // If deflate returns Z_OK and with zero avail_out, it must be
- // called again after making room in the output buffer because
-@@ -376,8 +380,11 @@
- while (strm->avail_out == 0);
-
- if (strm->avail_in != 0)
-- throw std::runtime_error ("failed to wrote file");
-- }
-+ throw std::runtime_error ("failed to write file");
-+ } while (flush != Z_FINISH);
-+
-+ if (status != Z_STREAM_END)
-+ throw std::runtime_error ("failed to write file");
- }
-
- void
diff --git a/octave-implicit.patch b/octave-implicit.patch
deleted file mode 100644
index 5ec0224..0000000
--- a/octave-implicit.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -up octave-4.2.0/m4/acinclude.m4.implicit octave-4.2.0/m4/acinclude.m4
---- octave-4.2.0/m4/acinclude.m4.implicit 2016-11-13 08:16:10.000000000 -0700
-+++ octave-4.2.0/m4/acinclude.m4 2016-12-06 14:19:48.866621459 -0700
-@@ -1646,12 +1646,13 @@ AC_DEFUN([OCTAVE_CHECK_SIZEOF_FORTRAN_IN
- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
- #include
- #include
-- ]], [[
- #if defined (OCTAVE_ENABLE_64)
- typedef int64_t octave_idx_type;
- #else
- typedef int octave_idx_type;
- #endif
-+ void F77_FUNC(foo,FOO) (octave_idx_type*, octave_idx_type**, octave_idx_type**);
-+ ]], [[
- octave_idx_type n = 2;
- octave_idx_type in[2];
- octave_idx_type out[2];
-diff -up octave-4.2.0/m4/link.m4.implicit octave-4.2.0/m4/link.m4
---- octave-4.2.0/m4/link.m4.implicit 2016-11-13 08:21:54.000000000 -0700
-+++ octave-4.2.0/m4/link.m4 2016-12-06 13:52:47.132003993 -0700
-@@ -22,6 +22,7 @@ AC_DEFUN([gl_FUNC_LINK],
- AC_RUN_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include
-+ #include
- ]],
- [[int result = 0;
- if (!link ("conftest.a", "conftest.b/"))
diff --git a/octave.spec b/octave.spec
index 3b6f691..1b145b7 100644
--- a/octave.spec
+++ b/octave.spec
@@ -13,8 +13,8 @@
Name: octave
Epoch: 6
-Version: 4.2.0
-Release: 16%{?rcver:.rc%{rcver}}%{?dist}
+Version: 4.2.1
+Release: 1%{?rcver:.rc%{rcver}}%{?dist}
Summary: A high-level language for numerical computations
Group: Applications/Engineering
License: GPLv3+
@@ -28,14 +28,9 @@ Source0: ftp://alpha.gnu.org/gnu/octave/octave-%{version}%{rctag}.tar.lz
# RPM macros for helping to build Octave packages
Source1: macros.octave
Source2: xorg.conf
-# Fix compilation with -Werror=implicit-declarations
-Patch1: octave-implicit.patch
# Remove project_group from appdata.xml file
# https://bugzilla.redhat.com/show_bug.cgi?id=1293561
Patch2: octave-appdata.patch
-# Fix gzip
-# https://savannah.gnu.org/bugs/?49760
-Patch3: octave-gzip.patch
# Add needed #include to bring in gnulib
Patch4: octave-gnulib.patch
@@ -185,9 +180,7 @@ This package contains documentation for Octave.
%prep
%setup -q -n %{name}-%{version}%{?rctag}
-%patch1 -p1 -b .implicit
%patch2 -p1 -b .appdata
-%patch3 -p0 -b .gzip
%patch4 -p1 -b .gnulib
# __osmesa_print__ test is triggering a crash in libgcc, disable it
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78409
@@ -431,6 +424,9 @@ fi
%{_pkgdocdir}/refcard*.pdf
%changelog
+* Fri Feb 24 2017 Orion Poplawski - 6:4.2.1-1
+- Update to 4.2.1
+
* Mon Feb 20 2017 Rex Dieter - 6:4.2.0-16
- rebuild (qscintilla)
diff --git a/sources b/sources
index 656eed2..801dba0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de47c55e39b55e8436a23fb176f45ee3 octave-4.2.0.tar.lz
+SHA512 (octave-4.2.1.tar.lz) = f7cb910ecfed7af3b645195e0554494a11f32c2a61c7da9272db4102b4b9351f882844f188c440d03caf534361357d907664605c9545c4940c2a6db7f40f2e32