diff --git a/.gitignore b/.gitignore index 7f1966f..1983efb 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ octave-3.2.4.tar.bz2 /octave-3.6.2.tar.bz2 /octave-3.6.3.tar.bz2 /octave-3.6.4-rc0.tar.bz2 +/octave-3.6.4-rc1.tar.gz diff --git a/octave-gets.patch b/octave-gets.patch deleted file mode 100644 index c7b8914..0000000 --- a/octave-gets.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -up octave-3.6.2-rc2/libgnu/stdio.in.h.gets octave-3.6.2-rc2/libgnu/stdio.in.h ---- octave-3.6.2-rc2/libgnu/stdio.in.h.gets 2012-05-24 12:46:13.000000000 -0600 -+++ octave-3.6.2-rc2/libgnu/stdio.in.h 2012-05-24 16:29:54.813734894 -0600 -@@ -1,12 +1,10 @@ --/* -*- buffer-read-only: t -*- vi: set ro: */ --/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ - /* A GNU-like . - - Copyright (C) 2004, 2007-2012 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 -- the Free Software Foundation; either version 3, or (at your option) -+ the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, -@@ -15,8 +13,7 @@ - GNU 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -+ along with this program; if not, see . */ - - #if __GNUC__ >= 3 - @PRAGMA_SYSTEM_HEADER@ -@@ -55,7 +52,8 @@ - #include - - /* Get off_t and ssize_t. Needed on many systems, including glibc 2.8 -- and eglibc 2.11.2. */ -+ and eglibc 2.11.2. -+ May also define off_t to a 64-bit type on native Windows. */ - #include - - /* The __attribute__ feature is available in gcc versions 2.5 and later. -@@ -701,22 +699,11 @@ _GL_WARN_ON_USE (getline, "getline is un - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - -@@ -781,7 +768,7 @@ _GL_CXXALIASWARN (pclose); - #elif defined GNULIB_POSIXCHECK - # undef pclose - # if HAVE_RAW_DECL_PCLOSE --_GL_WARN_ON_USE (pclose, "popen is unportable - " -+_GL_WARN_ON_USE (pclose, "pclose is unportable - " - "use gnulib module pclose for more portability"); - # endif - #endif -@@ -1056,9 +1043,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is - # endif - #endif - --/* Some people would argue that sprintf should be handled like gets -- (for example, OpenBSD issues a link warning for both functions), -- since both can cause security holes due to buffer overruns. -+/* Some people would argue that all sprintf uses should be warned about -+ (for example, OpenBSD issues a link warning for it), -+ since it can cause security holes due to buffer overruns. - However, we believe that sprintf can be used safely, and is more - efficient than snprintf in those safe cases; and as proof of our - belief, we use sprintf in several gnulib modules. So this header diff --git a/octave.spec b/octave.spec index 84bc82d..13e6841 100644 --- a/octave.spec +++ b/octave.spec @@ -2,14 +2,14 @@ %global octave_api api-v48+ # For rc versions, change release manually -%global rcver 0 +%global rcver 1 %if 0%{?rcver:1} %global rctag -rc%{?rcver} %endif Name: octave Version: 3.6.4 -Release: 0.3.rc0%{?dist} +Release: 0.4.rc1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering @@ -17,11 +17,10 @@ License: GPLv3+ %if 0%{!?rcver:1} Source0: ftp://ftp.gnu.org/gnu/octave/octave-%{version}.tar.bz2 %else -Source0: ftp://alpha.gnu.org/gnu/octave/octave-%{version}%{rctag}.tar.bz2 +Source0: ftp://alpha.gnu.org/gnu/octave/octave-%{version}%{rctag}.tar.gz %endif # RPM macros for helping to build Octave packages Source1: macros.octave -Patch0: octave-gets.patch # Ignore deps when doing a pkg build for now Patch1: octave-pkgbuilddeps.patch # https://savannah.gnu.org/bugs/index.php?32839 @@ -86,7 +85,6 @@ This package contains documentation for Octave. %prep %setup -q -n %{name}-%{version}%{?rctag} -%patch0 -p1 -b .gets %patch1 -p1 -b .pkgbuilddeps %patch2 -p1 -b .pkgbuilddir @@ -260,6 +258,10 @@ fi %changelog +* Fri Jan 4 2013 Orion Poplawski - 6:3.6.4-0.4.rc1 +- Update to 3.6.4-rc1 +- Drop gets patch + * Fri Dec 21 2012 Orion Poplawski - 6:3.6.4-0.3.rc0 - Add patch to ignore deps when building packages for now (bug 733615) diff --git a/sources b/sources index f4188e2..4931f43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c9026da372b71df665eef7d0020c10d octave-3.6.4-rc0.tar.bz2 +a8261dbeb3fa23c575c5c905c6770cc0 octave-3.6.4-rc1.tar.gz