From 71fb6f0e2da3df7c87c7422208dfedee2ac121c2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 17 Oct 2012 22:17:12 -0600 Subject: [PATCH 1/9] Update to 3.6.4-rc0 Drop sparse patch applied upstream --- .gitignore | 1 + octave-sparse.patch | 171 -------------------------------------------- octave.spec | 13 ++-- sources | 2 +- 4 files changed, 9 insertions(+), 178 deletions(-) delete mode 100644 octave-sparse.patch diff --git a/.gitignore b/.gitignore index 2bef977..7f1966f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ octave-3.2.4.tar.bz2 /octave-3.6.2-rc2.tar.bz2 /octave-3.6.2.tar.bz2 /octave-3.6.3.tar.bz2 +/octave-3.6.4-rc0.tar.bz2 diff --git a/octave-sparse.patch b/octave-sparse.patch deleted file mode 100644 index a12038d..0000000 --- a/octave-sparse.patch +++ /dev/null @@ -1,171 +0,0 @@ - -# HG changeset patch -# User David Bateman -# Date 1337385561 -7200 -# Node ID f2e72944847b9ec7cec586faa4c72ea91eb53881 -# Parent 997e05334f71269f16017ceb06a52cf33feced18 -Ensure sparse constructors have valid ridx and data indices even if they are zero matrices (bug #36104) - -diff --git a/liboctave/Sparse.cc b/liboctave/Sparse.cc ---- a/liboctave/Sparse.cc -+++ b/liboctave/Sparse.cc -@@ -235,7 +235,7 @@ - (*current_liboctave_error_handler) - ("Sparse::Sparse (const dim_vector&): dimension mismatch"); - else -- rep = new typename Sparse::SparseRep (dv(0), dv(1)); -+ rep = new typename Sparse::SparseRep (dv(0), dv(1), 0); - } - - template -@@ -301,11 +301,10 @@ - (*current_liboctave_error_handler) - ("sparse: column index %d out of bound %d", r.extent (nc), nc); - -- rep = new SparseRep (nr, nc); -+ rep = new typename Sparse::SparseRep (nr, nc, (nzm > 0 ? nzm : 0)); - - dimensions = dim_vector (nr, nc); - -- - octave_idx_type n = a.numel (), rl = r.length (nr), cl = c.length (nc); - bool a_scalar = n == 1; - if (a_scalar) -@@ -324,6 +323,7 @@ - if (n == 1 && a(0) != T ()) - { - change_capacity (nzm > 1 ? nzm : 1); -+ xcidx(0) = 0; - xridx(0) = r(0); - xdata(0) = a(0); - for (octave_idx_type j = 0; j < nc; j++) -@@ -352,6 +352,7 @@ - new_nz += rd[i-1] != rd[i]; - // Allocate result. - change_capacity (nzm > new_nz ? nzm : new_nz); -+ xcidx (0) = 0; - xcidx (1) = new_nz; - octave_idx_type *rri = ridx (); - T *rrd = data (); -@@ -494,6 +495,7 @@ - new_nz += rd[i-1] != rd[i]; - // Allocate result. - change_capacity (nzm > new_nz ? nzm : new_nz); -+ xcidx(0) = 0; - xcidx(1) = new_nz; - octave_idx_type *rri = ridx (); - T *rrd = data (); - - -# HG changeset patch -# User John W. Eaton -# Date 1340304125 14400 -# Node ID 4663cc835c65873fe12b599bcab11ba4a8f5fb87 -# Parent f2e72944847b9ec7cec586faa4c72ea91eb53881 -Special-case removing rows or columns from empty sparse matrices - -* Sparse.cc (Sparse::delete_elements): Don't attempt to preserve - elements if nnz = 0; simply reshape if number of rows or columns is zero. - -diff --git a/liboctave/Sparse.cc b/liboctave/Sparse.cc ---- a/liboctave/Sparse.cc -+++ b/liboctave/Sparse.cc -@@ -1240,16 +1240,31 @@ - gripe_del_index_out_of_range (false, idx_j.extent (nc), nc); - else if (idx_j.is_cont_range (nc, lb, ub)) - { -- const Sparse tmp = *this; -- octave_idx_type lbi = tmp.cidx(lb), ubi = tmp.cidx(ub), new_nz = nz - (ubi - lbi); -- *this = Sparse (nr, nc - (ub - lb), new_nz); -- copy_or_memcpy (lbi, tmp.data (), data ()); -- copy_or_memcpy (lbi, tmp.ridx (), ridx ()); -- copy_or_memcpy (nz - ubi, tmp.data () + ubi, xdata () + lbi); -- copy_or_memcpy (nz - ubi, tmp.ridx () + ubi, xridx () + lbi); -- copy_or_memcpy (lb, tmp.cidx () + 1, cidx () + 1); -- mx_inline_sub (nc - ub, xcidx () + lb + 1, -- tmp.cidx () + ub + 1, ubi - lbi); -+ if (lb == 0 && ub == nc) -+ { -+ // Delete all rows and columns. -+ *this = Sparse (nr, 0); -+ } -+ else if (nz == 0) -+ { -+ // No elements to preserve; adjust dimensions. -+ *this = Sparse (nr, nc - (ub - lb)); -+ } -+ else -+ { -+ const Sparse tmp = *this; -+ octave_idx_type lbi = tmp.cidx(lb), ubi = tmp.cidx(ub), -+ new_nz = nz - (ubi - lbi); -+ -+ *this = Sparse (nr, nc - (ub - lb), new_nz); -+ copy_or_memcpy (lbi, tmp.data (), data ()); -+ copy_or_memcpy (lbi, tmp.ridx (), ridx ()); -+ copy_or_memcpy (nz - ubi, tmp.data () + ubi, xdata () + lbi); -+ copy_or_memcpy (nz - ubi, tmp.ridx () + ubi, xridx () + lbi); -+ copy_or_memcpy (lb, tmp.cidx () + 1, cidx () + 1); -+ mx_inline_sub (nc - ub, xcidx () + lb + 1, -+ tmp.cidx () + ub + 1, ubi - lbi); -+ } - } - else - *this = index (idx_i, idx_j.complement (nc)); -@@ -1262,24 +1277,40 @@ - gripe_del_index_out_of_range (false, idx_i.extent (nr), nr); - else if (idx_i.is_cont_range (nr, lb, ub)) - { -- // This is more memory-efficient than the approach below. -- const Sparse tmpl = index (idx_vector (0, lb), idx_j); -- const Sparse tmpu = index (idx_vector (ub, nr), idx_j); -- *this = Sparse (nr - (ub - lb), nc, tmpl.nnz () + tmpu.nnz ()); -- for (octave_idx_type j = 0, k = 0; j < nc; j++) -+ if (lb == 0 && ub == nr) - { -- for (octave_idx_type i = tmpl.cidx(j); i < tmpl.cidx(j+1); i++) -+ // Delete all rows and columns. -+ *this = Sparse (0, nc); -+ } -+ else if (nz == 0) -+ { -+ // No elements to preserve; adjust dimensions. -+ *this = Sparse (nr - (ub - lb), nc); -+ } -+ else -+ { -+ // This is more memory-efficient than the approach below. -+ const Sparse tmpl = index (idx_vector (0, lb), idx_j); -+ const Sparse tmpu = index (idx_vector (ub, nr), idx_j); -+ *this = Sparse (nr - (ub - lb), nc, -+ tmpl.nnz () + tmpu.nnz ()); -+ for (octave_idx_type j = 0, k = 0; j < nc; j++) - { -- xdata(k) = tmpl.data(i); -- xridx(k++) = tmpl.ridx(i); -+ for (octave_idx_type i = tmpl.cidx(j); i < tmpl.cidx(j+1); -+ i++) -+ { -+ xdata(k) = tmpl.data(i); -+ xridx(k++) = tmpl.ridx(i); -+ } -+ for (octave_idx_type i = tmpu.cidx(j); i < tmpu.cidx(j+1); -+ i++) -+ { -+ xdata(k) = tmpu.data(i); -+ xridx(k++) = tmpu.ridx(i) + lb; -+ } -+ -+ xcidx(j+1) = k; - } -- for (octave_idx_type i = tmpu.cidx(j); i < tmpu.cidx(j+1); i++) -- { -- xdata(k) = tmpu.data(i); -- xridx(k++) = tmpu.ridx(i) + lb; -- } -- -- xcidx(j+1) = k; - } - } - else - diff --git a/octave.spec b/octave.spec index 8b24e1d..48c62de 100644 --- a/octave.spec +++ b/octave.spec @@ -2,14 +2,14 @@ %global octave_api api-v48+ # For rc versions, change release manually -#global rcver 2 +%global rcver 0 %if 0%{?rcver:1} %global rctag -rc%{?rcver} %endif Name: octave -Version: 3.6.3 -Release: 2%{?dist} +Version: 3.6.4 +Release: 0.1.rc0%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering @@ -24,8 +24,6 @@ Source1: macros.octave # https://savannah.gnu.org/bugs/index.php?32839 # Fix building packages from directories Patch2: octave-3.4.0-pkgbuilddir.patch -# Upstream patches to fix spase matrix handling -Patch3: octave-sparse.patch URL: http://www.octave.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -86,7 +84,6 @@ This package contains documentation for Octave. %prep %setup -q -n %{name}-%{version}%{?rctag} %patch2 -p1 -b .pkgbuilddir -%patch3 -p1 -b .sparse # Check permissions find -name *.cc -exec chmod 644 {} \; @@ -258,6 +255,10 @@ fi %changelog +* Wed Oct 17 2012 Orion Poplawski - 6:3.6.4-0.1.rc0 +- Update to 3.6.4-rc0 +- Drop sparse patch applied upstream + * Thu Sep 6 2012 Orion Poplawski - 6:3.6.3-2 - Add upstream patch to fix sparse matrix test crash diff --git a/sources b/sources index bfa783a..f4188e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29ab7e502e5c963c058906f788670245 octave-3.6.3.tar.bz2 +3c9026da372b71df665eef7d0020c10d octave-3.6.4-rc0.tar.bz2 From 61b8aad6dca2d91f8765958e9dbd6ec9f7f546b3 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Wed, 5 Dec 2012 10:50:22 -0700 Subject: [PATCH 2/9] Restore gets patch Rebuild for hdf5 1.8.10 --- octave-gets.patch | 86 +++++++++++++++++++++++++++++++++++++++++++++++ octave.spec | 8 ++++- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 octave-gets.patch diff --git a/octave-gets.patch b/octave-gets.patch new file mode 100644 index 0000000..c7b8914 --- /dev/null +++ b/octave-gets.patch @@ -0,0 +1,86 @@ +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 48c62de..30bf78a 100644 --- a/octave.spec +++ b/octave.spec @@ -9,7 +9,7 @@ Name: octave Version: 3.6.4 -Release: 0.1.rc0%{?dist} +Release: 0.2.rc0%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering @@ -21,6 +21,7 @@ Source0: ftp://alpha.gnu.org/gnu/octave/octave-%{version}%{rctag}.tar.bz2 %endif # RPM macros for helping to build Octave packages Source1: macros.octave +Patch0: octave-gets.patch # https://savannah.gnu.org/bugs/index.php?32839 # Fix building packages from directories Patch2: octave-3.4.0-pkgbuilddir.patch @@ -83,6 +84,7 @@ This package contains documentation for Octave. %prep %setup -q -n %{name}-%{version}%{?rctag} +%patch0 -p1 -b .gets %patch2 -p1 -b .pkgbuilddir # Check permissions @@ -255,6 +257,10 @@ fi %changelog +* Wed Dec 05 2012 Orion Poplawski - 6:3.6.4-0.2.rc0 +- Restore gets patch +- Rebuild for hdf5 1.8.10 + * Wed Oct 17 2012 Orion Poplawski - 6:3.6.4-0.1.rc0 - Update to 3.6.4-rc0 - Drop sparse patch applied upstream From 77aff487ffc637de1e039d7cd1f1ef249472cff2 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 21 Dec 2012 21:11:43 -0700 Subject: [PATCH 3/9] Add patch to ignore deps when building packages for now (bug 733615) --- octave-pkgbuilddeps.patch | 17 +++++++++++++++++ octave.spec | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 octave-pkgbuilddeps.patch diff --git a/octave-pkgbuilddeps.patch b/octave-pkgbuilddeps.patch new file mode 100644 index 0000000..582436c --- /dev/null +++ b/octave-pkgbuilddeps.patch @@ -0,0 +1,17 @@ +--- octave-3.6.4-rc0/scripts/pkg/pkg.m.deps 2012-12-21 20:44:11.309702885 -0700 ++++ octave-3.6.4-rc0/scripts/pkg/pkg.m 2012-12-21 20:51:19.529914112 -0700 +@@ -633,12 +633,12 @@ + endif + files(1) = []; + buildlist = fullfile (builddir, "octave_packages"); +- install (files, handle_deps, autoload, installdir, installdir, verbose, ++ install (files, false, autoload, installdir, installdir, verbose, + buildlist, "", false); + unwind_protect + repackage (builddir, buildlist); + unwind_protect_cleanup +- unload_packages ({"all"}, handle_deps, buildlist, ""); ++ unload_packages ({"all"}, false, buildlist, ""); + if (exist (installdir, "dir")) + rm_rf (installdir); + endif diff --git a/octave.spec b/octave.spec index 30bf78a..84bc82d 100644 --- a/octave.spec +++ b/octave.spec @@ -9,7 +9,7 @@ Name: octave Version: 3.6.4 -Release: 0.2.rc0%{?dist} +Release: 0.3.rc0%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering @@ -22,6 +22,8 @@ Source0: ftp://alpha.gnu.org/gnu/octave/octave-%{version}%{rctag}.tar.bz2 # 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 # Fix building packages from directories Patch2: octave-3.4.0-pkgbuilddir.patch @@ -85,6 +87,7 @@ 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 # Check permissions @@ -257,6 +260,9 @@ fi %changelog +* 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) + * Wed Dec 05 2012 Orion Poplawski - 6:3.6.4-0.2.rc0 - Restore gets patch - Rebuild for hdf5 1.8.10 From bd1ae277fe1179a154ab36ba185020773e956b5c Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 5 Jan 2013 07:59:21 -0700 Subject: [PATCH 4/9] Update to 3.6.4-rc1 Drop gets patch --- .gitignore | 1 + octave-gets.patch | 86 ----------------------------------------------- octave.spec | 12 ++++--- sources | 2 +- 4 files changed, 9 insertions(+), 92 deletions(-) delete mode 100644 octave-gets.patch 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 From 57fe3b2a736976acf0715431525b2cd32ecbda02 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 3 Feb 2013 13:02:00 -0700 Subject: [PATCH 5/9] Rebuild for broken deps in rawhide --- octave.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/octave.spec b/octave.spec index 13e6841..372a1c9 100644 --- a/octave.spec +++ b/octave.spec @@ -9,7 +9,7 @@ Name: octave Version: 3.6.4 -Release: 0.4.rc1%{?dist} +Release: 0.5.rc1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering @@ -258,6 +258,9 @@ fi %changelog +* Sun Feb 03 2013 Kevin Fenzi - 6:3.6.4-0.5.rc1 +- Rebuild for broken deps in rawhide + * Fri Jan 4 2013 Orion Poplawski - 6:3.6.4-0.4.rc1 - Update to 3.6.4-rc1 - Drop gets patch From 5a531d84fb73f59a155f823dc80152327260e606 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 12 Feb 2013 09:35:22 -0700 Subject: [PATCH 6/9] Drop vendor from desktop file --- octave.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/octave.spec b/octave.spec index 372a1c9..579c1d1 100644 --- a/octave.spec +++ b/octave.spec @@ -9,7 +9,7 @@ Name: octave Version: 3.6.4 -Release: 0.5.rc1%{?dist} +Release: 0.6.rc1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering @@ -131,7 +131,7 @@ touch %{buildroot}%{_datadir}/%{name}/ls-R # Create desktop file rm %{buildroot}%{_datadir}/applications/www.octave.org-octave.desktop -desktop-file-install --vendor fedora --remove-category Development --add-category "Education" \ +desktop-file-install --remove-category Development --add-category "Education" \ --add-category "DataVisualization" --add-category "NumericalAnalysis" --add-category "Engineering" --add-category "Physics" \ --dir %{buildroot}%{_datadir}/applications doc/icons/octave.desktop @@ -258,6 +258,9 @@ fi %changelog +* Tue Feb 12 2013 Orion Poplawski - 6:3.6.4-0.6.rc1 +- Drop vendor from desktop file + * Sun Feb 03 2013 Kevin Fenzi - 6:3.6.4-0.5.rc1 - Rebuild for broken deps in rawhide From b52feb73cadec652df44d9b97819d5cae9c44c70 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 12 Feb 2013 09:50:56 -0700 Subject: [PATCH 7/9] Update to 3.6.4-rc2 --- .gitignore | 1 + octave.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1983efb..0e3d1a5 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ octave-3.2.4.tar.bz2 /octave-3.6.3.tar.bz2 /octave-3.6.4-rc0.tar.bz2 /octave-3.6.4-rc1.tar.gz +/octave-3.6.4-rc2.tar.gz diff --git a/octave.spec b/octave.spec index 579c1d1..a23bc4d 100644 --- a/octave.spec +++ b/octave.spec @@ -2,14 +2,14 @@ %global octave_api api-v48+ # For rc versions, change release manually -%global rcver 1 +%global rcver 2 %if 0%{?rcver:1} %global rctag -rc%{?rcver} %endif Name: octave Version: 3.6.4 -Release: 0.6.rc1%{?dist} +Release: 0.7.rc2%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering @@ -258,6 +258,9 @@ fi %changelog +* Tue Feb 12 2013 Orion Poplawski - 6:3.6.4-0.7.rc2 +- Update to 3.6.4-rc2 + * Tue Feb 12 2013 Orion Poplawski - 6:3.6.4-0.6.rc1 - Drop vendor from desktop file diff --git a/sources b/sources index 4931f43..e7cbff6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8261dbeb3fa23c575c5c905c6770cc0 octave-3.6.4-rc1.tar.gz +6a1eae4dd9e94925c2f6fe5e2390d0df octave-3.6.4-rc2.tar.gz From 89d96cf4caeaa7bb2c546a0cf43220763e9a85c8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Tue, 12 Feb 2013 11:20:44 -0700 Subject: [PATCH 8/9] Fix name for desktop file --- octave.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octave.spec b/octave.spec index a23bc4d..d456bd8 100644 --- a/octave.spec +++ b/octave.spec @@ -232,7 +232,7 @@ fi %{_infodir}/liboctave.info* %{_infodir}/octave.info* %{_infodir}/OctaveFAQ.info* -%{_datadir}/applications/fedora-octave.desktop +%{_datadir}/applications/octave.desktop # octave_packages is %ghost, so need to list everything else separately %dir %{_datadir}/octave %{_datadir}/octave/%{version}%{?rctag}/ From 9b6b623cd97a4e9a44279edf5e550645e9734a19 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sat, 23 Feb 2013 18:50:29 -0700 Subject: [PATCH 9/9] Update to 3.6.4 final --- .gitignore | 1 + octave.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0e3d1a5..5f9c591 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ octave-3.2.4.tar.bz2 /octave-3.6.4-rc0.tar.bz2 /octave-3.6.4-rc1.tar.gz /octave-3.6.4-rc2.tar.gz +/octave-3.6.4.tar.bz2 diff --git a/octave.spec b/octave.spec index d456bd8..fde3e7d 100644 --- a/octave.spec +++ b/octave.spec @@ -2,14 +2,14 @@ %global octave_api api-v48+ # For rc versions, change release manually -%global rcver 2 +#global rcver %{nil} %if 0%{?rcver:1} %global rctag -rc%{?rcver} %endif Name: octave Version: 3.6.4 -Release: 0.7.rc2%{?dist} +Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering @@ -258,6 +258,9 @@ fi %changelog +* Sat Feb 23 2013 Orion Poplawski - 6:3.6.4-1 +- Update to 3.6.4 final + * Tue Feb 12 2013 Orion Poplawski - 6:3.6.4-0.7.rc2 - Update to 3.6.4-rc2 diff --git a/sources b/sources index e7cbff6..5ac0302 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a1eae4dd9e94925c2f6fe5e2390d0df octave-3.6.4-rc2.tar.gz +e0d3e5e3d38a66d3f8593ba065c6e2fd octave-3.6.4.tar.bz2