commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2020-08-29 20:44:10
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new.3399 (New)
Package is "octave"
Sat Aug 29 20:44:10 2020 rev:67 rq:830347 version:5.2.0
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2020-02-20
14:57:37.606552532 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new.3399/octave.changes 2020-08-29
20:44:30.369519175 +0200
@@ -1,0 +2,5 @@
+Thu Aug 20 09:01:26 UTC 2020 - Martin Liška
+
+- Use memoryperjob constraint instead of %limit_build macro.
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.P2yWsK/_old 2020-08-29 20:44:31.265519549 +0200
+++ /var/tmp/diff_new_pack.P2yWsK/_new 2020-08-29 20:44:31.269519551 +0200
@@ -84,7 +84,6 @@
BuildRequires: lapack-devel
# required for help/doc called from the tests
BuildRequires: makeinfo
-BuildRequires: memory-constraints
%if %{with imagemagick}
BuildRequires: pkgconfig(ImageMagick++)
%else
@@ -218,7 +217,6 @@
sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/%{blas_library}/g' %{SOURCE3}
%build
-%limit_build -m 700
# rebuild makefiles after Patch0
autoreconf -i -s -f
++ _constraints ++
--- /var/tmp/diff_new_pack.P2yWsK/_old 2020-08-29 20:44:31.305519566 +0200
+++ /var/tmp/diff_new_pack.P2yWsK/_new 2020-08-29 20:44:31.305519566 +0200
@@ -1,3 +1,4 @@
+
@@ -6,5 +7,8 @@
7
+
+ 700
+
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2020-02-20 14:57:24
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new.26092 (New)
Package is "octave"
Thu Feb 20 14:57:24 2020 rev:66 rq:777494 version:5.2.0
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2020-02-18
10:37:29.724588261 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new.26092/octave.changes 2020-02-20
14:57:37.606552532 +0100
@@ -1,0 +2,11 @@
+Mon Feb 17 13:17:38 UTC 2020 - Stefan Brüns
+
+- Avoid stealing SIGCHLD from QProcess::waitForFinished, which
+ causes the KDE file dialogs to hang up to the 30s default timeout.
+ This only happens when a samba server is installed locally.
+ Fixes https://savannah.gnu.org/bugs/?54607
+ * 0001-Disable-signal-handler-thread-avoid-duplicate-signal.patch
+- Add Xvfb build dependency for make check, several tests fail
+ otherwise.
+
+---
New:
0001-Disable-signal-handler-thread-avoid-duplicate-signal.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.8EbB2d/_old 2020-02-20 14:57:40.578558363 +0100
+++ /var/tmp/diff_new_pack.8EbB2d/_new 2020-02-20 14:57:40.578558363 +0100
@@ -62,6 +62,8 @@
Source3:octave.macros
# PATCH-FIX-OPENSUSE
Patch0: octave_tools_pie.patch
+# PATCH-FIX-UPSTREAM - https://savannah.gnu.org/bugs/?54607
+Patch1: 0001-Disable-signal-handler-thread-avoid-duplicate-signal.patch
BuildRequires: arpack-ng-devel
# Required for Patch0
BuildRequires: autoconf
@@ -112,6 +114,8 @@
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5PrintSupport)
+# testing
+BuildRequires: xorg-x11-Xvfb
# boo#1095605
Requires: libQt5Sql5-sqlite
Obsoletes: octave-gui < 4.0
@@ -208,6 +212,7 @@
%prep
%setup -q -n %{name}-%{src_ver}
%patch0 -p1
+%patch1 -p1
# define octave_blas macros
sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/%{blas_library}/g' %{SOURCE3}
@@ -272,6 +277,13 @@
%check
# Increase stack limits. OpenBLAS tests are run after some JVM test, and
OpenBLAS
# dgetrf is quite memory hungry, see
https://github.com/xianyi/OpenBLAS/issues/246
+
+%define X_display ":98"
+export DISPLAY=%{X_display}
+Xvfb %{X_display} >& Xvfb.log &
+trap "kill $! || true" EXIT
+sleep 10
+
echo "-Xss8m" > scripts/java/java.opts
make check
++ 0001-Disable-signal-handler-thread-avoid-duplicate-signal.patch ++
>From f80ba25e3df56e390ee0fa0fea17b2ac1748bfcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?=
Date: Mon, 17 Feb 2020 14:12:25 +0100
Subject: [PATCH] Disable signal handler thread, avoid duplicate signal
handlers
octave::set_signal_handlers installs handlers for a bunch of signals,
while the watcher thread waits for the same signals using sigwait.
As a result, it is unspecified if the signal will be handled in
interrupt context by the thread which installed the handlers, or by
the dedicated thread.
Using sigwait has the side effect of possibly also stealing any signals
from a thread which installs a signal handler later. This is the case
for e.g. QProcess::waitForFinished(), which will likely not receive
a SIGCHLD and run in a timeout. This occurs for the native KDE file
dialog, which will spawn external programs for the CIFS/SAMBA usershare
integration iff a SAMBA server is installed locally.
Note this somewhat reverses the problem for QProcess, as QProcess now
steals the SIGCHLD from octaves main thread, although only for a short
duration until the external process is finished. The latter is solved
with the upcoming Qt 5.15 + Linux 5.3, which no longer relies on
SIGCHLD: https://codereview.qt-project.org/c/qt/qtbase/+/108456/
See also https://bugreports.qt.io/browse/QTBUG-56338
Not using a dedicated signal handler thread removes a source of
indeterminism, and also fixes https://savannah.gnu.org/bugs/?54607
---
liboctave/wrappers/signal-wrappers.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/liboctave/wrappers/signal-wrappers.c
b/liboctave/wrappers/signal-wrappers.c
index 90ba890..d838555 100644
--- a/liboctave/wrappers/signal-wrappers.c
+++ b/liboctave/wrappers/signal-wrappers.c
@@ -699,7 +699,7 @@ signal_watcher (void *arg)
void
octave_create_interrupt_watcher_thread (octave_sig_handler *handler)
{
-#if ! defined (__WIN32__)
+#if 0
pthread_t sighandler_thread_id;
if (pthread_create (_thread_id, 0, signal_watcher, handler))
--
2.25.0
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2020-02-18 10:36:07
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new.26092 (New)
Package is "octave"
Tue Feb 18 10:36:07 2020 rev:65 rq:774717 version:5.2.0
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2020-02-10
21:55:11.158249448 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new.26092/octave.changes 2020-02-18
10:37:29.724588261 +0100
@@ -1,0 +2,7 @@
+Sun Feb 16 15:22:39 UTC 2020 - Stefan Brüns
+
+- Readd makeinfo to the build dependencies, called by octaves
+ doc/help functions from the tests. Disable doc generation
+ explicitly, otherwise it tries even without all tools present.
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.vqgSlI/_old 2020-02-18 10:37:32.680594293 +0100
+++ /var/tmp/diff_new_pack.vqgSlI/_new 2020-02-18 10:37:32.680594293 +0100
@@ -80,7 +80,8 @@
BuildRequires: gperf
BuildRequires: hdf5-devel
BuildRequires: lapack-devel
-#BuildRequires: makeinfo
+# required for help/doc called from the tests
+BuildRequires: makeinfo
BuildRequires: memory-constraints
%if %{with imagemagick}
BuildRequires: pkgconfig(ImageMagick++)
@@ -226,6 +227,7 @@
%{?with_jit: --enable-jit} \
%{!?with_java: --disable-java} \
--with-blas=%{blas_library} \
+ --disable-docs \
--enable-openmp
make %{?_smp_mflags}
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2020-02-10 21:55:04
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new.26092 (New)
Package is "octave"
Mon Feb 10 21:55:04 2020 rev:64 rq:772663 version:5.2.0
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2019-07-08
15:10:56.919340691 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new.26092/octave.changes 2020-02-10
21:55:11.158249448 +0100
@@ -1,0 +2,19 @@
+Sun Feb 9 07:18:41 UTC 2020 - Stefan Brüns
+
+- Update to version 5.2.0
+ This version is a bug fixing release, for details see:
+
https://www.gnu.org/software/octave/news/release/2020/01/31/octave-5.2.0-released.html
+- Drop upstream patches:
+ * octave-bug-55029-fix_pause_and_kbhit_with_glibc_2_28.patch
+ *
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part1.patch
+ *
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part2.patch
+- Use documentation from upstream tarball, no need to rebuild locally.
+- Cleanup spec file, remove conditionals for EOLed distributions.
+
+---
+Wed Nov 27 20:13:20 UTC 2019 - Stefan Brüns
+
+- Fix octave_pkg_test in RPM octave.macros, unpack pkg tarball
+ again, as the target directory is removed by 'pkg build'.
+
+---
Old:
octave-5.1.0.tar.lz
octave-bug-55029-fix_pause_and_kbhit_with_glibc_2_28.patch
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part1.patch
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part2.patch
New:
octave-5.2.0.tar.lz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.fDVTEc/_old 2020-02-10 21:55:13.490250736 +0100
+++ /var/tmp/diff_new_pack.fDVTEc/_new 2020-02-10 21:55:13.494250739 +0100
@@ -1,7 +1,7 @@
#
# spec file for package octave
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,25 +18,14 @@
%define apiver v53
# Required for RC builds, in this case version contains ~rc, src_ver -rc
-%define pkg_ver 5.1.0
+%define pkg_ver 5.2.0
%define src_ver %{pkg_ver}
# Use native graphics or gnuplot
%bcond_without native_graphics
# Build GUI
-%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 0
-%bcond_with gui
-%else
%bcond_without gui
-%endif
-
-# Use Qt5 GUI
-%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1
-%bcond_with qt5gui
-%else
-%bcond_without qt5gui
-%endif
# JIT compilation
%bcond_with jit
@@ -46,22 +35,11 @@
# Image processing library
# Default variant - GraphicsMagick
-%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 0
-%bcond_without imagemagick
-%else
%bcond_with imagemagick
-%endif
# Sound IO
%bcond_without sound
-# Build documentation
-%if 0%{?suse_version} == 1315
-%bcond_with doc
-%else
-%bcond_without doc
-%endif
-
# Allow building without openBLAS, e.g. for architectures
# like RISC-V where openBLAS is not available
%bcond_without openblas
@@ -78,16 +56,12 @@
Summary:A High Level Programming Language
License:GPL-3.0-or-later
Group: Productivity/Scientific/Math
-Url:http://www.octave.org/
+URL:http://www.octave.org/
Source: https://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz
Source2:octave.pc.in
Source3:octave.macros
# PATCH-FIX-OPENSUSE
Patch0: octave_tools_pie.patch
-# PATCH-FIX-UPSTREAM
-Patch1: octave-bug-55029-fix_pause_and_kbhit_with_glibc_2_28.patch
-Patch2:
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part1.patch
-Patch3:
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part2.patch
BuildRequires: arpack-ng-devel
# Required for Patch0
BuildRequires: autoconf
@@ -106,6 +80,7 @@
BuildRequires: gperf
BuildRequires: hdf5-devel
BuildRequires: lapack-devel
+#BuildRequires: makeinfo
BuildRequires: memory-constraints
%if %{with imagemagick}
BuildRequires: pkgconfig(ImageMagick++)
@@ -122,22 +97,14 @@
BuildRequires: termcap
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(zlib)
-# Documentation build requires
-%if %{with doc}
-BuildRequires: gnuplot
-BuildRequires: texinfo
-BuildRequires: texlive-dvips
-BuildRequires: texlive-latex
-%endif
# GUI build
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2019-07-08 15:10:56
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new.4615 (New)
Package is "octave"
Mon Jul 8 15:10:56 2019 rev:63 rq:713696 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2019-06-06
18:15:35.628716398 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new.4615/octave.changes 2019-07-08
15:10:56.919340691 +0200
@@ -1,0 +2,8 @@
+Fri Jul 05 12:14:16 2019 UTC - Markus Ebner
+
+- Backport fix: Cursor misplaced when entering newline in editor with tabs
indentation
+ behavior (bug #56533)
+ * Added
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part1.patch
+ * Added
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part2.patch
+
+---
New:
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part1.patch
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part2.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.S9UZ3V/_old 2019-07-08 15:10:58.407342119 +0200
+++ /var/tmp/diff_new_pack.S9UZ3V/_new 2019-07-08 15:10:58.411342123 +0200
@@ -86,6 +86,8 @@
Patch0: octave_tools_pie.patch
# PATCH-FIX-UPSTREAM
Patch1: octave-bug-55029-fix_pause_and_kbhit_with_glibc_2_28.patch
+Patch2:
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part1.patch
+Patch3:
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part2.patch
BuildRequires: arpack-ng-devel
# Required for Patch0
BuildRequires: autoconf
@@ -247,6 +249,8 @@
# autoconf in Leap 42.x is to old, so we just build without -pie there
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%endif
# define octave_blas macros
++
octave-bug-56533-Cursor_misplaced_when_entering_newline_in_editor_with_tabs_indentation-part1.patch
++
# HG changeset patch
# User Torsten Lilge
# Date 1561493414 -7200
# Node ID dffdabfd02138fd21c0d1e56d639c56b6c9c3fba
# Parent b8c0d5ad024f993929bac9a1f212b47ba06d731f
fix cursor position for editor smart indent after keyword (bug #56533)
* file-editor-tab.cc (notice_settings): initialize new class variable
holding the width of the character used for indentation;
(handle_cursor_moved): pass new class variable to smart_indent
* file-editor-tab.h: new class variable for indentation character width
* octave-qscintilla.cc (smart_indent): length of indentation character is
a new parameter which is used for setting the cursor position at the
end of the indentation of a new line
* octave-qscintilla.cc (smart_indent): new parameter
diff --git a/libgui/src/m-editor/file-editor-tab.cc
b/libgui/src/m-editor/file-editor-tab.cc
--- a/libgui/src/m-editor/file-editor-tab.cc
+++ b/libgui/src/m-editor/file-editor-tab.cc
@@ -2691,6 +2691,10 @@
_edit_area->setTabWidth
(settings->value ("editor/tab_width",2).toInt ());
+m_ind_char_width = 1;
+if (_edit_area->indentationsUseTabs ())
+ m_ind_char_width = _edit_area->tabWidth ();
+
_edit_area->SendScintilla (QsciScintillaBase::SCI_SETHSCROLLBAR,
settings->value
("editor/show_hscroll_bar",true).toBool ());
_edit_area->SendScintilla (QsciScintillaBase::SCI_SETSCROLLWIDTH,-1);
@@ -3040,7 +3044,8 @@
{
// Obviously, we have a newline here
if (_smart_indent || _auto_endif)
- _edit_area->smart_indent (_smart_indent, _auto_endif, _line);
+ _edit_area->smart_indent (_smart_indent, _auto_endif,
+_line, m_ind_char_width);
}
}
diff --git a/libgui/src/m-editor/file-editor-tab.h
b/libgui/src/m-editor/file-editor-tab.h
--- a/libgui/src/m-editor/file-editor-tab.h
+++ b/libgui/src/m-editor/file-editor-tab.h
@@ -304,6 +304,7 @@
bool _always_reload_changed_files;
bool _smart_indent;
int _auto_endif;
+int m_ind_char_width;
QFileSystemWatcher _file_system_watcher;
diff --git a/libgui/src/m-editor/octave-qscintilla.cc
b/libgui/src/m-editor/octave-qscintilla.cc
--- a/libgui/src/m-editor/octave-qscintilla.cc
+++ b/libgui/src/m-editor/octave-qscintilla.cc
@@ -499,8 +499,8 @@
}
// Do smart indendation after if, for, ...
- void octave_qscintilla::smart_indent (bool do_smart_indent,
-int do_auto_close, int line)
+ void
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2019-06-06 18:15:35
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new.4811 (New)
Package is "octave"
Thu Jun 6 18:15:35 2019 rev:62 rq:706384 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2019-03-26
15:39:12.876329527 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new.4811/octave.changes 2019-06-06
18:15:35.628716398 +0200
@@ -1,0 +2,7 @@
+Mon May 13 22:23:39 UTC 2019 - Duncan Mac-Vicar
+
+- Backport fix: pause and kbhit with glibc 2.28 end-of-file state
+ behavior (bug #55029)
+ * Added octave-bug-55029-fix_pause_and_kbhit_with_glibc_2_28.patch
+
+---
New:
octave-bug-55029-fix_pause_and_kbhit_with_glibc_2_28.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.vDY8AM/_old 2019-06-06 18:15:36.336716190 +0200
+++ /var/tmp/diff_new_pack.vDY8AM/_new 2019-06-06 18:15:36.336716190 +0200
@@ -84,6 +84,8 @@
Source3:octave.macros
# PATCH-FIX-OPENSUSE
Patch0: octave_tools_pie.patch
+# PATCH-FIX-UPSTREAM
+Patch1: octave-bug-55029-fix_pause_and_kbhit_with_glibc_2_28.patch
BuildRequires: arpack-ng-devel
# Required for Patch0
BuildRequires: autoconf
@@ -244,6 +246,7 @@
%if 0%{?suse_version} > 1315
# autoconf in Leap 42.x is to old, so we just build without -pie there
%patch0 -p1
+%patch1 -p1
%endif
# define octave_blas macros
++ octave-bug-55029-fix_pause_and_kbhit_with_glibc_2_28.patch ++
# HG changeset patch
# User Mike Miller
# Date 1554238576 25200
# Node ID c3716220d5b93c49e1c7cc8ebe0b76dd961f4ec7
# Parent fc73dafece570f201c18a4eb4a8729a654cfcfbb
fix pause and kbhit with glibc 2.28 end-of-file state behavior (bug #55029)
* sysdep.cc (octave::kbhit): Call "clearerr (stdin)" on end-of-file condition
in addition to "std::cin.clear ()". In glibc 2.28, end-of-file is persistent
and must be cleared by the application.
diff --git a/libinterp/corefcn/sysdep.cc b/libinterp/corefcn/sysdep.cc
--- a/libinterp/corefcn/sysdep.cc
+++ b/libinterp/corefcn/sysdep.cc
@@ -566,7 +566,10 @@
int c = std::cin.get ();
if (std::cin.fail () || std::cin.eof ())
- std::cin.clear ();
+ {
+std::cin.clear ();
+clearerr (stdin);
+ }
// Restore it, enabling system call restarts (if possible).
octave::set_interrupt_handler (saved_interrupt_handler, true);
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2019-03-26 15:39:07
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new.25356 (New)
Package is "octave"
Tue Mar 26 15:39:07 2019 rev:61 rq:681704 version:5.1.0
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2019-02-19
12:03:00.685057208 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new.25356/octave.changes 2019-03-26
15:39:12.876329527 +0100
@@ -1,0 +2,12 @@
+Mon Mar 4 19:18:26 UTC 2019 - Stefan Brüns
+
+- Update to version 5.1.0
+ * Long list of changes: see
+https://www.gnu.org/software/octave/NEWS-5.1.html
+
https://www.gnu.org/software/octave/news/release/2019/03/01/octave-5.1-released.html
+- Rebase octave_tools_pie.patch
+- Add conditional building with blas instead of openBLAS. Allows building
+ for architectures like RISC-V where openBLAS is not available (and probably
+ never will, RISC-V vector instructions do not fit the openBLAS model).
+
+---
Old:
octave-4.4.1.tar.xz
New:
octave-5.1.0.tar.lz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.f100Ji/_old 2019-03-26 15:39:14.076329049 +0100
+++ /var/tmp/diff_new_pack.f100Ji/_new 2019-03-26 15:39:14.080329047 +0100
@@ -16,6 +16,11 @@
#
+%define apiver v53
+# Required for RC builds, in this case version contains ~rc, src_ver -rc
+%define pkg_ver 5.1.0
+%define src_ver %{pkg_ver}
+
# Use native graphics or gnuplot
%bcond_without native_graphics
@@ -57,17 +62,24 @@
%bcond_without doc
%endif
+# Allow building without openBLAS, e.g. for architectures
+# like RISC-V where openBLAS is not available
+%bcond_without openblas
+
+%if %{with openblas}
+%define blas_library openblas
+%else
+%define blas_library blas
+%endif
+
Name: octave
-Version:4.4.1
+Version:%{pkg_ver}
Release:0
-# Required for RC builds, in this case version contains ~rc, src_ver -rc
-%define src_ver %{version}
Summary:A High Level Programming Language
License:GPL-3.0-or-later
Group: Productivity/Scientific/Math
-%define apiver v52
Url:http://www.octave.org/
-Source: https://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz
+Source: https://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz
Source2:octave.pc.in
Source3:octave.macros
# PATCH-FIX-OPENSUSE
@@ -78,6 +90,7 @@
BuildRequires: automake
BuildRequires: libtool
#
+BuildRequires: %{blas_library}-devel
BuildRequires: bison
BuildRequires: dejagnu
BuildRequires: fftw3-threads-devel
@@ -90,7 +103,6 @@
BuildRequires: hdf5-devel
BuildRequires: lapack-devel
BuildRequires: memory-constraints
-BuildRequires: openblas-devel
%if %{with imagemagick}
BuildRequires: pkgconfig(ImageMagick++)
%else
@@ -200,6 +212,7 @@
%packagedevel
Summary:Development files for Octave
Group: Development/Languages/Other
+Requires: %{blas_library}-devel
Requires: %{name}-cli = %{version}
Requires: fftw3-devel
Requires: fftw3-threads-devel
@@ -207,7 +220,6 @@
Requires: gcc-fortran
Requires: hdf5-devel
Requires: make
-Requires: openblas-devel
%descriptiondevel
Octave is a high level programming language. It is designed for the
@@ -235,7 +247,7 @@
%endif
# define octave_blas macros
-sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/openblas/g' %{SOURCE3}
+sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/%{blas_library}/g' %{SOURCE3}
%build
%limit_build -m 700
@@ -253,7 +265,7 @@
%{!?with_gui: --without-qt} \
%{?with_jit: --enable-jit} \
%{!?with_java: --disable-java} \
- --with-blas=openblas \
+ --with-blas=%{blas_library} \
--enable-openmp
make %{?_smp_mflags}
@@ -324,6 +336,7 @@
%doc README ChangeLog
%if %{with gui}
%{_libdir}/%{name}/%{src_ver}/exec/*-*-linux-gnu*/octave-gui
+%{_libdir}/%{name}/%{src_ver}/exec/*-*-linux-gnu*/octave-svgconvert
%{_libdir}/%{name}/%{src_ver}/liboctgui.so.*
%{_datadir}/%{name}/%{src_ver}/locale/
%{_datadir}/metainfo/*.xml
@@ -377,6 +390,7 @@
%{_libdir}/%{name}/%{src_ver}/lib*.so
%{_libdir}/%{name}/api-%{apiver}
%{_libdir}/pkgconfig/octave.pc
+%{_libdir}/pkgconfig/octinterp.pc
%config %{_sysconfdir}/rpm/macros.octave
%files doc
++ octave_tools_pie.patch ++
--- /var/tmp/diff_new_pack.f100Ji/_old 2019-03-26 15:39:14.160329016 +0100
+++ /var/tmp/diff_new_pack.f100Ji/_new 2019-03-26 15:39:14.160329016 +0100
@@ -1,6 +1,6 @@
--- octave-4.4.1/src/module.mk_orig2019-01-11 00:52:01.913918346 +0100
+++ octave-4.4.1/src/module.mk 2019-01-11 18:44:13.272208383
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2019-02-19 12:02:40
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new.28833 (New)
Package is "octave"
Tue Feb 19 12:02:40 2019 rev:60 rq:677180 version:4.4.1
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2019-01-15
09:16:53.630206551 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new.28833/octave.changes 2019-02-19
12:03:00.685057208 +0100
@@ -1,0 +2,5 @@
+Fri Feb 15 08:52:02 UTC 2019 - Guillaume GARDET
+
+- Add %limit_build to avoid build failures
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.TO7Xdv/_old 2019-02-19 12:03:01.577056752 +0100
+++ /var/tmp/diff_new_pack.TO7Xdv/_new 2019-02-19 12:03:01.577056752 +0100
@@ -89,6 +89,7 @@
BuildRequires: gperf
BuildRequires: hdf5-devel
BuildRequires: lapack-devel
+BuildRequires: memory-constraints
BuildRequires: openblas-devel
%if %{with imagemagick}
BuildRequires: pkgconfig(ImageMagick++)
@@ -237,6 +238,8 @@
sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/openblas/g' %{SOURCE3}
%build
+%limit_build -m 700
+
%if 0%{?suse_version} > 1315
# rebuild makefiles after Patch0
autoreconf -i -s -f
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2019-01-15 09:16:53
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new.28833 (New)
Package is "octave"
Tue Jan 15 09:16:53 2019 rev:59 rq:664887 version:4.4.1
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2019-01-10
15:23:46.702303320 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new.28833/octave.changes 2019-01-15
09:16:53.630206551 +0100
@@ -1,0 +2,7 @@
+Thu Jan 10 23:57:29 UTC 2019 - Stefan Brüns
+
+- Only set -fpie for octave executables, as LDFLAGS is set as link flag
+ in mkoctfile as default flags, leading to failing module builds.
+ Add octave_tools_pie.patch
+
+---
New:
octave_tools_pie.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.EZnnQq/_old 2019-01-15 09:16:54.578205668 +0100
+++ /var/tmp/diff_new_pack.EZnnQq/_new 2019-01-15 09:16:54.582205664 +0100
@@ -70,7 +70,14 @@
Source: https://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz
Source2:octave.pc.in
Source3:octave.macros
+# PATCH-FIX-OPENSUSE
+Patch0: octave_tools_pie.patch
BuildRequires: arpack-ng-devel
+# Required for Patch0
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+#
BuildRequires: bison
BuildRequires: dejagnu
BuildRequires: fftw3-threads-devel
@@ -111,11 +118,6 @@
BuildRequires: hicolor-icon-theme
BuildRequires: update-desktop-files
%if %{with qt5gui}
-# Required for Patch0
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
-#
BuildRequires: libqscintilla_qt5-devel
BuildRequires: libqt5-linguist
BuildRequires: libqt5-qttools
@@ -133,6 +135,7 @@
BuildRequires: qscintilla-devel
%endif
Obsoletes: octave-gui < 4.0
+Provides: octave-gui = %{version}
%endif
# Sound IO build requires
%if %{with sound}
@@ -225,23 +228,26 @@
%prep
%setup -q -n %{name}-%{src_ver}
+%if 0%{?suse_version} > 1315
+# autoconf in Leap 42.x is to old, so we just build without -pie there
+%patch0 -p1
+%endif
# define octave_blas macros
sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/openblas/g' %{SOURCE3}
%build
-
-export CFLAGS="%{optflags} -fPIE"
-export CXXFLAGS="%{optflags} -fPIE"
-export FFLAGS="%{optflags} -fPIE"
-export LDFLAGS="-pie"
+%if 0%{?suse_version} > 1315
+# rebuild makefiles after Patch0
+autoreconf -i -s -f
+%endif
%if 0%{?suse_version} > 1500
export QCOLLECTIONGENERATOR=qhelpgenerator-qt5
%endif
%configure \
--libexecdir=%{_libdir} \
- %{?with_gui: --enable-gui} \
- %{!?with_gui: --disable-gui} \
+ %{?with_gui: --with-qt} \
+ %{!?with_gui: --without-qt} \
%{?with_jit: --enable-jit} \
%{!?with_java: --disable-java} \
--with-blas=openblas \
++ octave_tools_pie.patch ++
--- octave-4.4.1/src/module.mk_orig 2019-01-11 00:52:01.913918346 +0100
+++ octave-4.4.1/src/module.mk 2019-01-11 18:44:13.272208383 +0100
@@ -68,6 +68,7 @@
%canon_reldir%_octave_LDFLAGS = \
$(NO_UNDEFINED_LDFLAG) \
$(OCTAVE_LINK_OPTS) \
+ -pie \
$(WARN_LDFLAGS)
if AMCOND_BUILD_QT_GUI
@@ -92,6 +93,7 @@
%canon_reldir%_octave_cli_LDFLAGS = \
$(NO_UNDEFINED_LDFLAG) \
$(OCTAVE_LINK_OPTS) \
+ -pie \
$(WARN_LDFLAGS)
%canon_reldir%_octave_cli_CPPFLAGS = \
@@ -121,6 +123,7 @@
%canon_reldir%_octave_gui_LDFLAGS = \
$(NO_UNDEFINED_LDFLAG) \
$(OCTAVE_GUI_LINK_OPTS) \
+ -pie \
$(WARN_LDFLAGS)
%canon_reldir%_octave_gui_CXXFLAGS = \
@@ -143,8 +146,14 @@
$(AM_CXXFLAGS) \
$(WARN_CXXFLAGS)
+%canon_reldir%_mkoctfile_LDFLAGS = \
+ -pie
+
%canon_reldir%_octave_config_SOURCES =
+%canon_reldir%_octave_config_LDFLAGS = \
+ -pie
+
nodist_%canon_reldir%_octave_config_SOURCES = %reldir%/octave-config.cc
%canon_reldir%_octave_config_LDADD = \
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2019-01-10 15:23:42
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new.28833 (New)
Package is "octave"
Thu Jan 10 15:23:42 2019 rev:58 rq:664167 version:4.4.1
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2018-06-25
11:41:32.967366020 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new.28833/octave.changes 2019-01-10
15:23:46.702303320 +0100
@@ -1,0 +2,12 @@
+Thu Jan 3 02:39:29 UTC 2019 - Stefan Brüns
+
+- Update to version 4.4.1
+ * Long list of changes: see
+
https://www.gnu.org/software/octave/news/release/2018/08/09/octave-4.4.1-released.html
+- Drop obsolete Fix-build-with-Qt-511.patch
+- Fix build with Qt 5.12, use qhelpgenerator for qcollectiongenerator
+- Stop messing with upstream appdata/desktop files
+- Use %bcond_with/%bcond_without
+- Fix unit tests by increasing JVM stack limit, see
https://savannah.gnu.org/bugs/index.php?55395
+
+---
Old:
Fix-build-with-Qt-511.patch
octave-4.4.0.tar.lz
New:
octave-4.4.1.tar.xz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.8BBv9O/_old 2019-01-10 15:23:47.438302559 +0100
+++ /var/tmp/diff_new_pack.8BBv9O/_new 2019-01-10 15:23:47.438302559 +0100
@@ -1,7 +1,7 @@
#
# spec file for package octave
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,50 +12,53 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
# Use native graphics or gnuplot
-%define with_native_graphics 1
+%bcond_without native_graphics
+
# Build GUI
-%define with_gui 1
+%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 0
+%bcond_with gui
+%else
+%bcond_without gui
+%endif
+
# Use Qt5 GUI
-%define with_qt5gui 1
+%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1
+%bcond_with qt5gui
+%else
+%bcond_without qt5gui
+%endif
+
# JIT compilation
-%define with_jit 0
+%bcond_with jit
+
# JAVA support
-%define with_java 1
+%bcond_without java
+
# Image processing library
# Default variant - GraphicsMagick
-%define with_imagemagick 0
-# Sound IO
-%define with_sound 1
-# BLAS library
-%define with_openblas 1
-# Build documentation
-%define with_doc 1
-
-%if 0%{?suse_version} <= 1320
-%define with_qt5gui 0
-%define with_doc 0
-%endif
-
-# SLE12
%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 0
-%define with_gui 0
-%define with_jit 0
-%define with_imagemagick 1
+%bcond_without imagemagick
+%else
+%bcond_with imagemagick
%endif
-# architecture-specific
-%ifarch %ix86
-# tests failure with openblas
-%define with_openblas 0
+# Sound IO
+%bcond_without sound
+
+# Build documentation
+%if 0%{?suse_version} == 1315
+%bcond_with doc
+%else
+%bcond_without doc
%endif
Name: octave
-Version:4.4.0
+Version:4.4.1
Release:0
# Required for RC builds, in this case version contains ~rc, src_ver -rc
%define src_ver %{version}
@@ -64,18 +67,11 @@
Group: Productivity/Scientific/Math
%define apiver v52
Url:http://www.octave.org/
-Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz
+Source: https://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz
Source2:octave.pc.in
Source3:octave.macros
-# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch Add a missing include
-Patch0: Fix-build-with-Qt-511.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
-%if 0%{?with_openblas}
-BuildRequires: openblas-devel
-%else
-BuildRequires: blas-devel
-%endif
BuildRequires: dejagnu
BuildRequires: fftw3-threads-devel
BuildRequires: flex
@@ -86,7 +82,8 @@
BuildRequires: gperf
BuildRequires: hdf5-devel
BuildRequires: lapack-devel
-%if 0%{?with_imagemagick}
+BuildRequires: openblas-devel
+%if %{with imagemagick}
BuildRequires: pkgconfig(ImageMagick++)
%else
BuildRequires: pkgconfig(GraphicsMagick++)
@@ -102,18 +99,18 @@
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(zlib)
# Documentation build requires
-%if 0%{?with_doc}
+%if %{with doc}
BuildRequires: gnuplot
BuildRequires: texinfo
BuildRequires: texlive-dvips
BuildRequires: texlive-latex
%endif
# GUI build requires
-%if 0%{?with_gui}
+%if %{with
commit octave for openSUSE:Factory
Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2018-06-25 11:41:24 Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) Package is "octave" Mon Jun 25 11:41:24 2018 rev:57 rq:618567 version:4.4.0 Changes: --- /work/SRC/openSUSE:Factory/octave/octave.changes2018-06-07 15:29:22.23024 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2018-06-25 11:41:32.967366020 +0200 @@ -1,0 +2,5 @@ +Fri Jun 22 21:18:56 UTC 2018 - dmitr...@opensuse.org + +- Qt5 GUI package requires libQt5Sql5-sqlite [boo#1095605] + +--- Other differences: -- ++ octave.spec ++ --- /var/tmp/diff_new_pack.JGZAuP/_old 2018-06-25 11:41:33.983328518 +0200 +++ /var/tmp/diff_new_pack.JGZAuP/_new 2018-06-25 11:41:33.983328518 +0200 @@ -128,6 +128,8 @@ BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5PrintSupport) +# boo#1095605 +Requires: libQt5Sql5-sqlite %else BuildRequires: libqt4-devel BuildRequires: libqt4-devel-doc
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2018-06-07 15:29:16
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Thu Jun 7 15:29:16 2018 rev:56 rq:614262 version:4.4.0
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2018-05-29
10:32:55.211072719 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2018-06-07
15:29:22.23024 +0200
@@ -1,0 +2,6 @@
+Mon Jun 4 12:26:52 UTC 2018 - christo...@krop.fr
+
+- Add Fix-build-with-Qt-511.patch.
+- Use %license for license files
+
+---
New:
Fix-build-with-Qt-511.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.bLLuDg/_old 2018-06-07 15:29:23.672378089 +0200
+++ /var/tmp/diff_new_pack.bLLuDg/_new 2018-06-07 15:29:23.676377942 +0200
@@ -67,6 +67,8 @@
Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz
Source2:octave.pc.in
Source3:octave.macros
+# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch Add a missing include
+Patch0: Fix-build-with-Qt-511.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
%if 0%{?with_openblas}
@@ -231,6 +233,7 @@
%prep
%setup -q -n %{name}-%{src_ver}
+%patch0 -p1
# define octave_blas macros
%if 0%{?with_openblas}
@@ -329,8 +332,8 @@
%install_info_delete --info-dir=%{_infodir} %{_infodir}/octave.info.gz
%files
-%defattr(-,root,root,-)
-%doc AUTHORS BUGS COPYING NEWS
+%license COPYING
+%doc AUTHORS BUGS NEWS
%doc README ChangeLog
%if 0%{?with_gui}
%{_libdir}/%{name}/%{src_ver}/exec/*-*-linux-gnu*/octave-gui
@@ -345,7 +348,6 @@
%endif
%files cli
-%defattr(-,root,root)
%{_bindir}/octave
%{_bindir}/octave-%{src_ver}
%{_bindir}/octave-cli
@@ -379,7 +381,6 @@
%{_libdir}/%{name}/site
%files devel
-%defattr(-,root,root)
%{_bindir}/mkoctfile
%{_bindir}/mkoctfile-%{src_ver}
%if 0%{?with_doc}
@@ -392,7 +393,6 @@
%config %{_sysconfdir}/rpm/macros.octave
%files doc
-%defattr(-,root,root)
%doc doc/interpreter/octave.pdf
%doc doc/liboctave/liboctave.pdf
%doc doc/refcard/refcard-a4.pdf
++ Fix-build-with-Qt-511.patch ++
changeset: 25410:cdaa884568b1
branch: stable
parent: 25394:9e39a53b4e00
user:Mike Miller
date:Thu May 24 19:20:35 2018 -0700
summary: add Qt include needed to build against Qt 5.11 (bug #53978)
diff -r 9e39a53b4e00 -r cdaa884568b1 libgui/src/settings-dialog.cc
--- a/libgui/src/settings-dialog.cc Fri May 18 19:26:41 2018 -0400
+++ b/libgui/src/settings-dialog.cc Thu May 24 19:20:35 2018 -0700
@@ -34,6 +34,8 @@
#include "workspace-model.h"
#include "settings-dialog.h"
#include "ui-settings-dialog.h"
+
+#include
#include
#include
#include
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2018-05-29 10:32:47
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Tue May 29 10:32:47 2018 rev:55 rq:610623 version:4.4.0
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2018-03-19
23:40:38.508453938 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2018-05-29
10:32:55.211072719 +0200
@@ -1,0 +2,9 @@
+Wed May 16 19:57:17 UTC 2018 - dmitr...@opensuse.org
+
+- Update to version 4.4.0
+ See https://www.gnu.org/software/octave/NEWS-4.4.html for details
+- Drop octave-java-use-source-target-1_6.patch
+- Drop SLE11 support (already broken)
+- Drop update-alternatives usage
+
+---
Old:
octave-4.2.2.tar.lz
octave-java-use-source-target-1_6.patch
New:
octave-4.4.0.tar.lz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.pu44n7/_old 2018-05-29 10:32:56.967007866 +0200
+++ /var/tmp/diff_new_pack.pu44n7/_new 2018-05-29 10:32:56.967007866 +0200
@@ -33,16 +33,12 @@
%define with_sound 1
# BLAS library
%define with_openblas 1
+# Build documentation
+%define with_doc 1
%if 0%{?suse_version} <= 1320
%define with_qt5gui 0
-%endif
-
-# SLE11
-%if 0%{?suse_version} == 1110
-%define with_gui 0
-%define with_jit 0
-%define with_imagemagick 1
+%define with_doc 0
%endif
# SLE12
@@ -59,20 +55,18 @@
%endif
Name: octave
-Version:4.2.2
+Version:4.4.0
Release:0
# Required for RC builds, in this case version contains ~rc, src_ver -rc
%define src_ver %{version}
Summary:A High Level Programming Language
License:GPL-3.0-or-later
Group: Productivity/Scientific/Math
-%define apiver v51
+%define apiver v52
Url:http://www.octave.org/
Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz
Source2:octave.pc.in
Source3:octave.macros
-# PATCH-FIX-UPSTREAM octave-java-use-source-target-1_6.patch
badshah...@gmail.com -- Switch source/target to 1.6 from 1.3, to get octave
building with java 9 (for openSUSE >= 1320); patch taken from upstream
mercurial repository.
-Patch1: octave-java-use-source-target-1_6.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
%if 0%{?with_openblas}
@@ -106,10 +100,12 @@
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(zlib)
# Documentation build requires
+%if 0%{?with_doc}
BuildRequires: gnuplot
BuildRequires: texinfo
BuildRequires: texlive-dvips
BuildRequires: texlive-latex
+%endif
# GUI build requires
%if 0%{?with_gui}
BuildRequires: desktop-file-utils
@@ -123,13 +119,16 @@
#
BuildRequires: libqscintilla_qt5-devel
BuildRequires: libqt5-linguist
+BuildRequires: libqt5-qttools
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Help)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5PrintSupport)
%else
BuildRequires: libqt4-devel
+BuildRequires: libqt4-devel-doc
BuildRequires: qscintilla-devel
%endif
Obsoletes: octave-gui < 4.0
@@ -164,8 +163,7 @@
BuildRequires: unzip
BuildRequires: zip
Requires: octave-cli = %{version}
-Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(pre): update-alternatives
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -180,8 +178,7 @@
Summary:Command-line user interface for Octave
Group: Productivity/Scientific/Math
Requires: makeinfo
-Requires(post): update-alternatives
-Requires(preun): update-alternatives
+Requires(pre): update-alternatives
%if 0%{?with_native_graphics}
Recommends: epstool
Recommends: pstoedit
@@ -198,7 +195,7 @@
%packagedevel
Summary:Development files for Octave
-Group: Productivity/Scientific/Math
+Group: Development/Languages/Other
Requires: %{name}-cli = %{version}
%if 0%{?with_openblas}
Requires: openblas-devel
@@ -242,15 +239,7 @@
sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/blas/g' %{SOURCE3}
%endif
-%if 0%{?suse_version} > 1320
-%patch1 -p1
-%endif
-
%build
-# Patch0 and Patch1 edit m4 files, so regenerate configure
-%if 0%{?with_qt5gui} || 0%{?suse_version} > 1320
-autoreconf -fvi
-%endif
export CPPFLAGS="-DH5_USE_16_API"
%configure \
@@ -300,11 +289,12 @@
%endif
# gui related fixes
%if %{?with_gui}
-mv %{buildroot}/%{_datadir}/applications/*octave.desktop
%{buildroot}/%{_datadir}/applications/octave.desktop
+mv
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2018-03-19 23:40:11
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Mon Mar 19 23:40:11 2018 rev:54 rq:588690 version:4.2.2
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2017-10-05
12:03:38.619587358 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2018-03-19
23:40:38.508453938 +0100
@@ -1,0 +2,9 @@
+Mon Mar 19 14:37:36 UTC 2018 - badshah...@gmail.com
+
+- Update to version 4.2.2:
+ * Long list of changes: see
+
https://www.gnu.org/software/octave/news/release/2018/03/13/octave-4.2.2-released.html
+- Drop octave-also-check-for-qscintilla2_qt5.patch: incorporated
+ upstream.
+
+---
Old:
octave-4.2.1.tar.lz
octave-also-check-for-qscintilla2_qt5.patch
New:
octave-4.2.2.tar.lz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.8bsgjw/_old 2018-03-19 23:40:40.372386698 +0100
+++ /var/tmp/diff_new_pack.8bsgjw/_new 2018-03-19 23:40:40.372386698 +0100
@@ -1,7 +1,7 @@
#
# spec file for package octave
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -59,20 +59,18 @@
%endif
Name: octave
-Version:4.2.1
+Version:4.2.2
Release:0
# Required for RC builds, in this case version contains ~rc, src_ver -rc
%define src_ver %{version}
Summary:A High Level Programming Language
-License:GPL-3.0+
+License:GPL-3.0-or-later
Group: Productivity/Scientific/Math
%define apiver v51
Url:http://www.octave.org/
Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz
Source2:octave.pc.in
Source3:octave.macros
-# PATCH-FIX-UPSTREAM octave-also-check-for-qscintilla2_qt5.patch
badshah...@gmail.com -- When checking for the availibility of QT5 bindings for
scintilla, also check for qscintilla2_qt5 (which is the name used by openSUSE);
patch taken from upstream
-Patch0: octave-also-check-for-qscintilla2_qt5.patch
# PATCH-FIX-UPSTREAM octave-java-use-source-target-1_6.patch
badshah...@gmail.com -- Switch source/target to 1.6 from 1.3, to get octave
building with java 9 (for openSUSE >= 1320); patch taken from upstream
mercurial repository.
Patch1: octave-java-use-source-target-1_6.patch
BuildRequires: arpack-ng-devel
@@ -244,10 +242,6 @@
sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/blas/g' %{SOURCE3}
%endif
-%if 0%{?with_qt5gui}
-%patch0 -p1
-%endif
-
%if 0%{?suse_version} > 1320
%patch1 -p1
%endif
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2017-10-05 11:59:57
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Thu Oct 5 11:59:57 2017 rev:53 rq:531047 version:4.2.1
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2017-08-24
18:56:48.440176477 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2017-10-05
12:03:38.619587358 +0200
@@ -1,0 +2,8 @@
+Mon Oct 2 09:06:34 UTC 2017 - badshah...@gmail.com
+
+- Add octave-java-use-source-target-1_6.patch: Switch
+ source/target to 1.6 from 1.3, to get octave building with java
+ 9 (for openSUSE > 1320); patch taken from upstream mercurial
+ repository [https://savannah.gnu.org/bugs/?51803].
+
+---
New:
octave-java-use-source-target-1_6.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.v2HYn1/_old 2017-10-05 12:03:40.611307149 +0200
+++ /var/tmp/diff_new_pack.v2HYn1/_new 2017-10-05 12:03:40.615306586 +0200
@@ -73,6 +73,8 @@
Source3:octave.macros
# PATCH-FIX-UPSTREAM octave-also-check-for-qscintilla2_qt5.patch
badshah...@gmail.com -- When checking for the availibility of QT5 bindings for
scintilla, also check for qscintilla2_qt5 (which is the name used by openSUSE);
patch taken from upstream
Patch0: octave-also-check-for-qscintilla2_qt5.patch
+# PATCH-FIX-UPSTREAM octave-java-use-source-target-1_6.patch
badshah...@gmail.com -- Switch source/target to 1.6 from 1.3, to get octave
building with java 9 (for openSUSE >= 1320); patch taken from upstream
mercurial repository.
+Patch1: octave-java-use-source-target-1_6.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
%if 0%{?with_openblas}
@@ -246,9 +248,13 @@
%patch0 -p1
%endif
+%if 0%{?suse_version} > 1320
+%patch1 -p1
+%endif
+
%build
-# Patch0 edits m4 files, so regenerate configure
-%if 0%{?with_qt5gui}
+# Patch0 and Patch1 edit m4 files, so regenerate configure
+%if 0%{?with_qt5gui} || 0%{?suse_version} > 1320
autoreconf -fvi
%endif
++ octave-java-use-source-target-1_6.patch ++
# HG changeset patch
# User Mike Miller
# Date 1503469686 25200
# Node ID 20c83f6191028871b7ebd568cb93485cdee45244
# Parent 712736d43124183e64ef96c581b5e43dba0f2672
bump Java compatibility level to 1.6, minimum supported by Java 9 (bug #51803)
* scripts/java/module.mk (%.class): Compile Java with -source 1.6 -target 1.6.
* ov-java.cc (octave::JVMArgs::JVMArgs, initialize_jvm, thread_jni_env): Use
JNI_VERSION_1_6 to initialize the JVM. Thanks to Ernst Reissner for the
suggestion.
Index: octave-4.2.1/libinterp/octave-value/ov-java.cc
===
--- octave-4.2.1.orig/libinterp/octave-value/ov-java.cc
+++ octave-4.2.1/libinterp/octave-value/ov-java.cc
@@ -190,7 +190,7 @@ namespace octave
JVMArgs (void)
{
- vm_args.version = JNI_VERSION_1_2;
+ vm_args.version = JNI_VERSION_1_6;
vm_args.nOptions = 0;
vm_args.options = 0;
vm_args.ignoreUnrecognized = false;
@@ -590,12 +590,12 @@ initialize_jvm (void)
// At least one JVM exists, try to attach to it
switch (jvm->GetEnv (reinterpret_cast (_env),
- JNI_VERSION_1_2))
+ JNI_VERSION_1_6))
{
case JNI_EDETACHED:
// Attach the current thread
JavaVMAttachArgs vm_args;
- vm_args.version = JNI_VERSION_1_2;
+ vm_args.version = JNI_VERSION_1_6;
vm_args.name = const_cast ("octave");
vm_args.group = 0;
if (jvm->AttachCurrentThread (reinterpret_cast
(_env),
@@ -709,7 +709,7 @@ thread_jni_env (void)
JNIEnv *env = 0;
if (jvm)
-jvm->GetEnv (reinterpret_cast (), JNI_VERSION_1_2);
+jvm->GetEnv (reinterpret_cast (), JNI_VERSION_1_6);
return env;
}
Index: octave-4.2.1/scripts/java/module.mk
===
--- octave-4.2.1.orig/scripts/java/module.mk
+++ octave-4.2.1/scripts/java/module.mk
@@ -36,7 +36,10 @@ scripts_java_JAVA_CLASSES = $(addprefix
$(scripts_java_JAVA_CLASSES) : %.class : %.java |
scripts/java/$(octave_dirstamp)
$(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
- ( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3
-Xlint:-options -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2017-08-24 18:56:30
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Thu Aug 24 18:56:30 2017 rev:52 rq:518452 version:4.2.1
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2017-08-22
11:09:55.909813349 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2017-08-24
18:56:48.440176477 +0200
@@ -1,0 +2,6 @@
+Wed Aug 23 15:54:46 UTC 2017 - dmitr...@opensuse.org
+
+- Fix octave-devel package requirements
+- Add %octave_blas macros
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.CGGQJf/_old 2017-08-24 18:56:50.887831830 +0200
+++ /var/tmp/diff_new_pack.CGGQJf/_new 2017-08-24 18:56:50.891831267 +0200
@@ -207,7 +207,7 @@
%endif
Requires: fftw3-devel
Requires: fftw3-threads-devel
-Requires: gcc
+Requires: gcc-c++
Requires: gcc-fortran
Requires: hdf5-devel
Requires: make
@@ -235,6 +235,13 @@
%prep
%setup -q -n %{name}-%{src_ver}
+# define octave_blas macros
+%if 0%{?with_openblas}
+sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/openblas/g' %{SOURCE3}
+%else
+sed -i 's/OCTAVE_BLAS_LIBRARY_NAME/blas/g' %{SOURCE3}
+%endif
+
%if 0%{?with_qt5gui}
%patch0 -p1
%endif
++ octave.macros ++
--- /var/tmp/diff_new_pack.CGGQJf/_old 2017-08-24 18:56:51.039810430 +0200
+++ /var/tmp/diff_new_pack.CGGQJf/_new 2017-08-24 18:56:51.039810430 +0200
@@ -53,3 +53,6 @@
fi ; \
fi ; \
done
+
+# Octave build parameters
+%octave_blas OCTAVE_BLAS_LIBRARY_NAME
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2017-08-22 11:09:50
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Tue Aug 22 11:09:50 2017 rev:51 rq:517917 version:4.2.1
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2017-08-13
14:58:47.484147059 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2017-08-22
11:09:55.909813349 +0200
@@ -1,0 +2,5 @@
+Mon Aug 21 11:26:32 UTC 2017 - dmitr...@opensuse.org
+
+- Move mkoctfile binary to octave-devel package
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.3sWV1Y/_old 2017-08-22 11:09:58.145498552 +0200
+++ /var/tmp/diff_new_pack.3sWV1Y/_new 2017-08-22 11:09:58.157496863 +0200
@@ -188,7 +188,6 @@
# transfig requires texlive installation now
# Recommends: transfig
%endif
-Recommends: octave-devel = %{version}
Recommends: octave-doc = %{version}
%descriptioncli
@@ -202,16 +201,16 @@
Group: Productivity/Scientific/Math
Requires: %{name}-cli = %{version}
%if 0%{?with_openblas}
-Recommends: openblas-devel
+Requires: openblas-devel
%else
-Recommends: blas-devel
+Requires: blas-devel
%endif
-Recommends: fftw3-devel
-Recommends: fftw3-threads-devel
-Recommends: gcc
-Recommends: gcc-fortran
-Recommends: hdf5-devel
-Recommends: make
+Requires: fftw3-devel
+Requires: fftw3-threads-devel
+Requires: gcc
+Requires: gcc-fortran
+Requires: hdf5-devel
+Requires: make
%descriptiondevel
Octave is a high level programming language. It is designed for the
@@ -398,9 +397,6 @@
%{_bindir}/octave-cli-%{src_ver}
%{_mandir}/man1/octave.1.gz
%{_mandir}/man1/octave-cli.1.gz
-%{_bindir}/mkoctfile
-%{_bindir}/mkoctfile-%{src_ver}
-%{_mandir}/man1/mkoctfile.1.gz
%{_bindir}/octave-config
%{_bindir}/octave-config-%{src_ver}
%{_mandir}/man1/octave-config.1.gz
@@ -425,6 +421,9 @@
%files devel
%defattr(-,root,root)
+%{_bindir}/mkoctfile
+%{_bindir}/mkoctfile-%{src_ver}
+%{_mandir}/man1/mkoctfile.1.gz
%{_includedir}/*
%{_libdir}/%{name}/%{src_ver}/lib*.so
%{_libdir}/%{name}/api-%{apiver}
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2017-08-13 14:58:40
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Sun Aug 13 14:58:40 2017 rev:50 rq:515930 version:4.2.1
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2017-07-21
22:49:59.491715417 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2017-08-13
14:58:47.484147059 +0200
@@ -1,0 +2,7 @@
+Thu Aug 10 07:53:51 UTC 2017 - dmitr...@opensuse.org
+
+- Reenable sparce matrix support
+- Build with openBLAS library by default, except i*86 architectures
+ due to tests failures
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.quyxuG/_old 2017-08-13 14:58:50.615707576 +0200
+++ /var/tmp/diff_new_pack.quyxuG/_new 2017-08-13 14:58:50.627705892 +0200
@@ -20,7 +20,7 @@
%define with_native_graphics 1
# Build GUI
%define with_gui 1
-# Use Qt5 Qt5 GUI
+# Use Qt5 GUI
%define with_qt5gui 1
# JIT compilation
%define with_jit 0
@@ -31,6 +31,8 @@
%define with_imagemagick 0
# Sound IO
%define with_sound 1
+# BLAS library
+%define with_openblas 1
%if 0%{?suse_version} <= 1320
%define with_qt5gui 0
@@ -50,6 +52,12 @@
%define with_imagemagick 1
%endif
+# architecture-specific
+%ifarch %ix86
+# tests failure with openblas
+%define with_openblas 0
+%endif
+
Name: octave
Version:4.2.1
Release:0
@@ -67,7 +75,11 @@
Patch0: octave-also-check-for-qscintilla2_qt5.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
+%if 0%{?with_openblas}
+BuildRequires: openblas-devel
+%else
BuildRequires: blas-devel
+%endif
BuildRequires: dejagnu
BuildRequires: fftw3-threads-devel
BuildRequires: flex
@@ -89,6 +101,7 @@
BuildRequires: qhull-devel
BuildRequires: qrupdate-devel
BuildRequires: readline-devel
+BuildRequires: suitesparse-devel
BuildRequires: termcap
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(zlib)
@@ -108,7 +121,7 @@
BuildRequires: automake
BuildRequires: libtool
#
-BuildRequires: libqscintilla-qt5-devel
+BuildRequires: libqscintilla_qt5-devel
BuildRequires: libqt5-linguist
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
@@ -172,7 +185,8 @@
%if 0%{?with_native_graphics}
Recommends: epstool
Recommends: pstoedit
-Recommends: transfig
+# transfig requires texlive installation now
+# Recommends: transfig
%endif
Recommends: octave-devel = %{version}
Recommends: octave-doc = %{version}
@@ -187,7 +201,11 @@
Summary:Development files for Octave
Group: Productivity/Scientific/Math
Requires: %{name}-cli = %{version}
+%if 0%{?with_openblas}
+Recommends: openblas-devel
+%else
Recommends: blas-devel
+%endif
Recommends: fftw3-devel
Recommends: fftw3-threads-devel
Recommends: gcc
@@ -231,6 +249,11 @@
export CPPFLAGS="-DH5_USE_16_API"
%configure \
--libexecdir=%{_libdir} \
+ %if 0%{?with_openblas}
+ --with-blas=openblas \
+ %else
+ --with-blas=blas \
+ %endif
%if %{?with_gui} == 0
--disable-gui \
%endif
@@ -240,10 +263,6 @@
%if %{?with_java} == 0
--disable-java \
%endif
- %if 0%{?suse_version} <= 1310
- --with-umfpack="-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt
-llapack" \
- --with-cholmod="-lcholmod -lsuitesparseconfig -lrt" \
- %endif
--enable-openmp
make %{?_smp_mflags}
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2017-07-21 22:49:57
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Fri Jul 21 22:49:57 2017 rev:49 rq:511535 version:4.2.1
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2017-02-28
23:51:44.971280281 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2017-07-21
22:49:59.491715417 +0200
@@ -1,0 +2,23 @@
+Mon Jul 10 22:09:11 UTC 2017 - badshah...@gmail.com
+
+- Edit _constraints file to require at least 2GB physical memory,
+ builds on 32-bit systems fail otherwise; see
+ https://savannah.gnu.org/bugs/index.php?51436; fixes build
+ failures on i586 for openSUSE > 1320.
+- Drop suitesparse-devel BuildRequires; this pulls in openblas,
+ which is not recommended by upstream. See comment #2 in
+ https://savannah.gnu.org/bugs/index.php?51436.
+
+---
+Mon Jun 26 14:12:29 UTC 2017 - badshah...@gmail.com
+
+- Add octave-also-check-for-qscintilla2_qt5.patch: When checking
+ for the availibility of QT5 bindings for scintilla, also check
+ for qscintilla2_qt5 (which is the shlib name used by openSUSE),
+ otherwise this causes the in-built editor to be disabled; patch
+ taken from upstream. Since patch modifies m4 files, regenerate
+ configure before executing it (add BuildRequires on automake,
+ autoconf and libtool). All changes applied conditionally only
+ when building against Qt5.
+
+---
New:
octave-also-check-for-qscintilla2_qt5.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.pFGzTH/_old 2017-07-21 22:50:00.515570989 +0200
+++ /var/tmp/diff_new_pack.pFGzTH/_new 2017-07-21 22:50:00.519570425 +0200
@@ -63,6 +63,8 @@
Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz
Source2:octave.pc.in
Source3:octave.macros
+# PATCH-FIX-UPSTREAM octave-also-check-for-qscintilla2_qt5.patch
badshah...@gmail.com -- When checking for the availibility of QT5 bindings for
scintilla, also check for qscintilla2_qt5 (which is the name used by openSUSE);
patch taken from upstream
+Patch0: octave-also-check-for-qscintilla2_qt5.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -87,7 +89,6 @@
BuildRequires: qhull-devel
BuildRequires: qrupdate-devel
BuildRequires: readline-devel
-BuildRequires: suitesparse-devel
BuildRequires: termcap
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(zlib)
@@ -102,6 +103,11 @@
BuildRequires: hicolor-icon-theme
BuildRequires: update-desktop-files
%if 0%{?with_qt5gui}
+# Required for Patch0
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
+#
BuildRequires: libqscintilla-qt5-devel
BuildRequires: libqt5-linguist
BuildRequires: pkgconfig(Qt5Core)
@@ -212,7 +218,16 @@
%prep
%setup -q -n %{name}-%{src_ver}
+%if 0%{?with_qt5gui}
+%patch0 -p1
+%endif
+
%build
+# Patch0 edits m4 files, so regenerate configure
+%if 0%{?with_qt5gui}
+autoreconf -fvi
+%endif
+
export CPPFLAGS="-DH5_USE_16_API"
%configure \
--libexecdir=%{_libdir} \
++ _constraints ++
--- /var/tmp/diff_new_pack.pFGzTH/_old 2017-07-21 22:50:00.65348 +0200
+++ /var/tmp/diff_new_pack.pFGzTH/_new 2017-07-21 22:50:00.65348 +0200
@@ -1,5 +1,8 @@
+
+ 2
+
7
++ octave-also-check-for-qscintilla2_qt5.patch ++
# HG changeset patch
# User Rik
# Date 1492620233 25200
# Node ID a759896c2b53ef0f831b46a7c910c4532a9e0901
# Parent 7ca04e85f9e3194b721c4a7e1371d61105617955
acinclude.m4: Look for "qscintilla_qt5" as another name for Qt5 scintilla
library.
* acinclude.m4 (OCTAVE_CHECK_QT_VERSION): Add "qscintilla2_qt5" to list of
possible Qt5 QScintilla library names.
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
--- a/m4/acinclude.m4
+++ b/m4/acinclude.m4
@@ -1346,7 +1346,7 @@
;;
5)
QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
+ octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5
qt5scintilla2"
;;
*)
AC_MSG_ERROR([Unrecognized Qt version $qt_version])
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2017-02-28 23:51:36
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Tue Feb 28 23:51:36 2017 rev:48 rq:460989 version:4.2.1
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2016-11-16
13:33:19.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2017-02-28
23:51:44.971280281 +0100
@@ -1,0 +2,6 @@
+Tue Feb 28 14:42:03 UTC 2017 - dmitr...@opensuse.org
+
+- Update to version 4.2.1
+ * See icluded NEWS file for details
+
+---
Old:
octave-4.2.0.tar.lz
New:
octave-4.2.1.tar.lz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.k4SZcG/_old 2017-02-28 23:51:46.519061821 +0100
+++ /var/tmp/diff_new_pack.k4SZcG/_new 2017-02-28 23:51:46.523061258 +0100
@@ -1,7 +1,7 @@
#
# spec file for package octave
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -51,7 +51,7 @@
%endif
Name: octave
-Version:4.2.0
+Version:4.2.1
Release:0
# Required for RC builds, in this case version contains ~rc, src_ver -rc
%define src_ver %{version}
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2016-11-16 13:33:18
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2016-11-10
13:28:48.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-11-16
13:33:19.0 +0100
@@ -1,0 +2,6 @@
+Tue Nov 15 20:17:03 UTC 2016 - dmitr...@opensuse.org
+
+- Update to version 4.2.0
+ * See icluded NEWS file for details
+
+---
Old:
octave-4.2.0-rc4.tar.lz
New:
octave-4.2.0.tar.lz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.0xA72L/_old 2016-11-16 13:33:21.0 +0100
+++ /var/tmp/diff_new_pack.0xA72L/_new 2016-11-16 13:33:21.0 +0100
@@ -51,16 +51,16 @@
%endif
Name: octave
-Version:4.2.0~rc4
+Version:4.2.0
Release:0
# Required for RC builds, in this case version contains ~rc, src_ver -rc
-%define src_ver 4.2.0-rc4
+%define src_ver %{version}
Summary:A High Level Programming Language
License:GPL-3.0+
Group: Productivity/Scientific/Math
%define apiver v51
Url:http://www.octave.org/
-Source: ftp://alpha.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz
+Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz
Source2:octave.pc.in
Source3:octave.macros
BuildRequires: arpack-ng-devel
commit octave for openSUSE:Factory
Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2016-11-10 13:28:46 Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) Package is "octave" Changes: --- /work/SRC/openSUSE:Factory/octave/octave.changes2016-11-04 21:00:50.0 +0100 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-11-10 13:28:48.0 +0100 @@ -1,0 +2,6 @@ +Thu Nov 10 08:08:08 UTC 2016 - dmitr...@opensuse.org + +- Update to version 4.2.0-rc4 + * See icluded NEWS file for details + +--- Old: octave-4.2.0-rc3.tar.lz New: octave-4.2.0-rc4.tar.lz Other differences: -- ++ octave.spec ++ --- /var/tmp/diff_new_pack.N1YShE/_old 2016-11-10 13:28:49.0 +0100 +++ /var/tmp/diff_new_pack.N1YShE/_new 2016-11-10 13:28:49.0 +0100 @@ -51,10 +51,10 @@ %endif Name: octave -Version:4.2.0~rc3 +Version:4.2.0~rc4 Release:0 # Required for RC builds, in this case version contains ~rc, src_ver -rc -%define src_ver 4.2.0-rc3 +%define src_ver 4.2.0-rc4 Summary:A High Level Programming Language License:GPL-3.0+ Group: Productivity/Scientific/Math
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2016-11-04 21:00:49
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2016-10-23
12:52:31.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-11-04
21:00:50.0 +0100
@@ -1,0 +2,15 @@
+Mon Oct 31 17:01:37 UTC 2016 - dmitr...@opensuse.org
+
+- Update to version 4.2.0-rc3
+ * See icluded NEWS file for details
+ * Drop octave-gui-info-links.patch, octave-gui-utf8.patch
+
+---
+Thu Oct 27 15:32:47 UTC 2016 - dmitr...@opensuse.org
+
+- Fix Qt5-based GUI documentation links
+ * octave-gui-info-links.patch
+- Fix Qt4-based GUI text encoding [boo#1005431]
+ * octave-gui-utf8.patch
+
+---
Old:
octave-4.2.0-rc2.tar.xz
New:
octave-4.2.0-rc3.tar.lz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.6nIseO/_old 2016-11-04 21:00:52.0 +0100
+++ /var/tmp/diff_new_pack.6nIseO/_new 2016-11-04 21:00:52.0 +0100
@@ -51,16 +51,16 @@
%endif
Name: octave
-Version:4.2.0~rc2
+Version:4.2.0~rc3
Release:0
# Required for RC builds, in this case version contains ~rc, src_ver -rc
-%define src_ver 4.2.0-rc2
+%define src_ver 4.2.0-rc3
Summary:A High Level Programming Language
License:GPL-3.0+
Group: Productivity/Scientific/Math
%define apiver v51
Url:http://www.octave.org/
-Source: ftp://alpha.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz
+Source: ftp://alpha.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.lz
Source2:octave.pc.in
Source3:octave.macros
BuildRequires: arpack-ng-devel
@@ -81,6 +81,7 @@
%else
BuildRequires: pkgconfig(GraphicsMagick++)
%endif
+BuildRequires: lzip
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: qhull-devel
@@ -88,7 +89,6 @@
BuildRequires: readline-devel
BuildRequires: suitesparse-devel
BuildRequires: termcap
-BuildRequires: xz
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(zlib)
# Documentation build requires
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2016-10-23 12:52:29
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2016-10-20
23:09:59.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-10-23
12:52:31.0 +0200
@@ -1,0 +2,7 @@
+Wed Oct 19 07:12:08 UTC 2016 - dmitr...@opensuse.org
+
+- Build Qt5-based GUI for openSUSE Tumbleweed
+- Clean build requires
+- Move pkg-config file to octave-devel package
+
+---
@@ -13 +20 @@
-- Update to version 4.2.0~rc1
+- Update to version 4.2.0~rc2
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.QFCUBZ/_old 2016-10-23 12:52:32.0 +0200
+++ /var/tmp/diff_new_pack.QFCUBZ/_new 2016-10-23 12:52:32.0 +0200
@@ -20,6 +20,8 @@
%define with_native_graphics 1
# Build GUI
%define with_gui 1
+# Use Qt5 Qt5 GUI
+%define with_qt5gui 1
# JIT compilation
%define with_jit 0
# JAVA support
@@ -30,6 +32,10 @@
# Sound IO
%define with_sound 1
+%if 0%{?suse_version} <= 1320
+%define with_qt5gui 0
+%endif
+
# SLE11
%if 0%{?suse_version} == 1110
%define with_gui 0
@@ -63,23 +69,18 @@
BuildRequires: dejagnu
BuildRequires: fftw3-threads-devel
BuildRequires: flex
-BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
-BuildRequires: gl2ps-devel
BuildRequires: glpk-devel
BuildRequires: gmp-devel
-BuildRequires: gnuplot
BuildRequires: gperf
BuildRequires: hdf5-devel
BuildRequires: lapack-devel
%if 0%{?with_imagemagick}
-BuildRequires: libMagick++-devel
+BuildRequires: pkgconfig(ImageMagick++)
%else
-BuildRequires: libGraphicsMagick++-devel
+BuildRequires: pkgconfig(GraphicsMagick++)
%endif
-BuildRequires: libcurl-devel
-BuildRequires: liblcms-devel
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: qhull-devel
@@ -87,27 +88,38 @@
BuildRequires: readline-devel
BuildRequires: suitesparse-devel
BuildRequires: termcap
+BuildRequires: xz
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(zlib)
+# Documentation build requires
+BuildRequires: gnuplot
BuildRequires: texinfo
-%if 0%{?suse_version} > 1220
BuildRequires: texlive-dvips
-%endif
BuildRequires: texlive-latex
-BuildRequires: xz
-BuildRequires: zlib-devel
# GUI build requires
%if 0%{?with_gui}
BuildRequires: desktop-file-utils
BuildRequires: hicolor-icon-theme
+BuildRequires: update-desktop-files
+%if 0%{?with_qt5gui}
+BuildRequires: libqscintilla-qt5-devel
+BuildRequires: libqt5-linguist
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5OpenGL)
+BuildRequires: pkgconfig(Qt5PrintSupport)
+%else
BuildRequires: libqt4-devel
BuildRequires: qscintilla-devel
-BuildRequires: update-desktop-files
+%endif
Obsoletes: octave-gui < 4.0
%endif
# Sound IO build requires
%if 0%{?with_sound}
-BuildRequires: alsa-devel
-BuildRequires: libsndfile-devel
-BuildRequires: portaudio-devel
+BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(portaudio-2.0)
+BuildRequires: pkgconfig(sndfile)
%endif
# JAVA functions build requires
%if 0%{?with_java}
@@ -119,16 +131,13 @@
%endif
# Native graphics build requires
%if 0%{?with_native_graphics}
-%if 0%{?suse_version} > 1220
-BuildRequires: glu-devel
-%endif
BuildRequires: Mesa-devel
BuildRequires: fltk-devel
-BuildRequires: fontconfig-devel
-BuildRequires: xorg-x11-devel
-BuildRequires: xorg-x11-libSM-devel
-BuildRequires: xorg-x11-libX11-devel
-BuildRequires: xorg-x11-libXext-devel
+BuildRequires: gl2ps-devel
+BuildRequires: pkgconfig(fontconfig)
+BuildRequires: pkgconfig(freetype2)
+BuildRequires: pkgconfig(glu)
+BuildRequires: pkgconfig(xft)
%else
Requires: gnuplot
%endif
@@ -379,13 +388,13 @@
%endif
%{_datadir}/octave/
%{_libdir}/%{name}/site
-%{_libdir}/pkgconfig/octave.pc
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/%{name}/%{src_ver}/lib*.so
%{_libdir}/%{name}/api-%{apiver}
+%{_libdir}/pkgconfig/octave.pc
%config %{_sysconfdir}/rpm/macros.octave
%files doc
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2016-10-20 23:09:28
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2016-10-02
00:09:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-10-20
23:09:59.0 +0200
@@ -1,0 +2,9 @@
+Tue Oct 18 13:25:54 UTC 2016 - badshah...@gmail.com
+
+- Run %desktop_database_post(un) and %icon_theme_cache_post(un)
+ for %post(un) to update the icon theme cache (required whenever
+ application installs icons to the hicolor icon dir) and desktop
+ database (required whenever application installs a .desktop
+ file) when building with GUI enabled.
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.yqFV1G/_old 2016-10-20 23:10:00.0 +0200
+++ /var/tmp/diff_new_pack.yqFV1G/_new 2016-10-20 23:10:00.0 +0200
@@ -279,6 +279,10 @@
%post
%{_sbindir}/update-alternatives --install %{_bindir}/%{name}-%{src_ver}
%{name} %{_bindir}/%{name}-gui-%{src_ver} 50
/sbin/ldconfig
+%if 0%{?with_gui}
+%desktop_database_post
+%icon_theme_cache_post
+%endif
%posttrans
if [ "$1" = 0 ] ; then
@@ -294,6 +298,10 @@
%postun
/sbin/ldconfig
+%if 0%{?with_gui}
+%desktop_database_postun
+%icon_theme_cache_postun
+%endif
%post cli
%{_sbindir}/update-alternatives --install %{_bindir}/%{name}-%{src_ver}
%{name} %{_bindir}/%{name}-cli-%{src_ver} 20
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2016-10-02 00:09:21
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2016-08-31
00:11:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-10-02
00:09:22.0 +0200
@@ -1,0 +2,21 @@
+Fri Sep 23 20:33:21 UTC 2016 - dmitr...@opensuse.org
+
+- Update to version 4.2.0~rc1
+ * See icluded NEWS file for details
+- Drop obsolete ocatve-evalc.patch
+
+---
+Sat Sep 17 13:43:12 UTC 2016 - dmitr...@opensuse.org
+
+- Fix evalc crash
+ * ocatve-evalc.patch
+
+---
+Sun Sep 11 08:20:25 UTC 2016 - dmitr...@opensuse.org
+
+- Update to version 4.2.0~rc1
+ * See icluded NEWS file for details
+- Drop obsolete octave-gcc6.patch
+- Temporary set MALLOC_PERTURB_=0 for tests
+
+---
Old:
octave-4.0.3.tar.xz
octave-gcc6.patch
New:
octave-4.2.0-rc2.tar.xz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.9VEK23/_old 2016-10-02 00:09:24.0 +0200
+++ /var/tmp/diff_new_pack.9VEK23/_new 2016-10-02 00:09:24.0 +0200
@@ -45,19 +45,18 @@
%endif
Name: octave
-Version:4.0.3
+Version:4.2.0~rc2
Release:0
# Required for RC builds, in this case version contains ~rc, src_ver -rc
-%define src_ver %{version}
+%define src_ver 4.2.0-rc2
Summary:A High Level Programming Language
License:GPL-3.0+
Group: Productivity/Scientific/Math
-%define apiver v50+
+%define apiver v51
Url:http://www.octave.org/
-Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz
+Source: ftp://alpha.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz
Source2:octave.pc.in
Source3:octave.macros
-Patch1: octave-gcc6.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -201,19 +200,8 @@
This package contains documentation for Octave.
-%if 0%{?suse_version} > 1320
-%if %( echo `rpm -q --queryformat %%{version} gcc` ) > 5
-%define with_gcc6 1
-%endif
-%endif
-
%prep
%setup -q -n %{name}-%{src_ver}
-%if 0%{?with_gcc6}
-%patch1 -p1
-find -name \*.cc -o -name \*.h -o -name \*.yy | xargs sed -i -e 's/#include
/#include <\1.h>/'
-find -name \*.h -o -name \*.cc | xargs sed -i -e 's//"config.h"/' -e
's//"base-list.h"/'
-%endif
%build
export CPPFLAGS="-DH5_USE_16_API"
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2016-08-31 00:10:31
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2016-08-03
11:43:56.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-08-31
00:11:47.0 +0200
@@ -1,0 +2,5 @@
+Fri Aug 26 21:26:33 UTC 2016 - dmitr...@opensuse.org
+
+- Fix suse-alternative-link-missing [boo#994253]
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.wgouMU/_old 2016-08-31 00:11:49.0 +0200
+++ /var/tmp/diff_new_pack.wgouMU/_new 2016-08-31 00:11:49.0 +0200
@@ -333,6 +333,7 @@
%doc AUTHORS BUGS COPYING NEWS
%doc README ChangeLog
%ghost %{_sysconfdir}/alternatives/%{name}
+%ghost %{_sysconfdir}/alternatives/%{name}-%{src_ver}
%ghost %{_bindir}/%{name}-%{src_ver}
%{_bindir}/%{name}-gui
%{_bindir}/%{name}-gui-%{src_ver}
@@ -353,6 +354,7 @@
%{_bindir}/%{name}
%ghost %{_bindir}/%{name}-%{src_ver}
%ghost %{_sysconfdir}/alternatives/%{name}
+%ghost %{_sysconfdir}/alternatives/%{name}-%{src_ver}
%{_bindir}/octave-cli
%{_bindir}/octave-cli-%{src_ver}
%{_mandir}/man1/octave.1.gz
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2016-08-03 11:43:44
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2016-06-21
12:29:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-08-03
11:43:56.0 +0200
@@ -1,0 +2,18 @@
+Fri Jul 29 06:10:33 UTC 2016 - dmitr...@opensuse.org
+
+- Use original appdata file
+- Fix SLE12 build
+
+---
+Thu Jul 28 05:40:50 UTC 2016 - badshah...@gmail.com
+
+- Update to version 4.0.3:
+ * Bug fix release, see
+http://www.gnu.org/software/octave/fixes-4-0-3.html for a full
+list of fixes.
+- Add appdata file as source, and install it to
+ /usr/share/appdata; this makes octave appear on appstores like
+ gnome-software and KDE Discover.
+- Rebase octave-gcc6.patch for current version.
+
+---
Old:
octave-4.0.2.tar.xz
New:
octave-4.0.3.tar.xz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.vLMbOh/_old 2016-08-03 11:43:58.0 +0200
+++ /var/tmp/diff_new_pack.vLMbOh/_new 2016-08-03 11:43:58.0 +0200
@@ -45,7 +45,7 @@
%endif
Name: octave
-Version:4.0.2
+Version:4.0.3
Release:0
# Required for RC builds, in this case version contains ~rc, src_ver -rc
%define src_ver %{version}
@@ -265,6 +265,10 @@
%if %{?with_gui}
mv %{buildroot}/%{_datadir}/applications/*octave.desktop
%{buildroot}/%{_datadir}/applications/octave.desktop
%suse_update_desktop_file -r octave "Science;Math"
+# appdata
+mv %{buildroot}%{_datadir}/appdata/*octave.appdata.xml
%{buildroot}%{_datadir}/appdata/octave.appdata.xml
+sed -i 's/www.octave.org-octave.desktop/octave.desktop/'
%{buildroot}%{_datadir}/appdata/octave.appdata.xml
+sed -i 's/screenshot.png/screenshot-2016.png/'
%{buildroot}%{_datadir}/appdata/octave.appdata.xml
%else
rm -rf %{buildroot}/%{_datadir}/icons/hicolor/
rm -rf %{buildroot}/%{_datadir}/appdata/
++ octave-4.0.2.tar.xz -> octave-4.0.3.tar.xz ++
/work/SRC/openSUSE:Factory/octave/octave-4.0.2.tar.xz
/work/SRC/openSUSE:Factory/.octave.new/octave-4.0.3.tar.xz differ: char 26,
line 1
++ octave-gcc6.patch ++
--- /var/tmp/diff_new_pack.vLMbOh/_old 2016-08-03 11:43:58.0 +0200
+++ /var/tmp/diff_new_pack.vLMbOh/_new 2016-08-03 11:43:58.0 +0200
@@ -1,6 +1,7 @@
-diff -up octave-4.0.0/libinterp/corefcn/pr-output.cc.abs
octave-4.0.0/libinterp/corefcn/pr-output.cc
octave-4.0.0/libinterp/corefcn/pr-output.cc.abs2015-05-23
08:21:53.0 -0600
-+++ octave-4.0.0/libinterp/corefcn/pr-output.cc2016-02-21
08:59:30.966291273 -0700
+Index: octave-4.0.3/libinterp/corefcn/pr-output.cc
+===
+--- octave-4.0.3.orig/libinterp/corefcn/pr-output.cc
octave-4.0.3/libinterp/corefcn/pr-output.cc
@@ -21,7 +21,7 @@ along with Octave; see the file COPYING.
*/
@@ -25,9 +26,10 @@
template
/* static */ inline void
octave_print_internal_template (std::ostream& os, const intNDArray& nda,
-diff -up octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib
octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh
octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib 2015-05-23
08:21:53.0 -0600
-+++ octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh 2016-02-19
19:50:04.693811663 -0700
+Index: octave-4.0.3/liboctave/cruft/Faddeeva/Faddeeva.hh
+===
+--- octave-4.0.3.orig/liboctave/cruft/Faddeeva/Faddeeva.hh
octave-4.0.3/liboctave/cruft/Faddeeva/Faddeeva.hh
@@ -27,6 +27,7 @@
#ifndef FADDEEVA_HH
#define FADDEEVA_HH 1
@@ -36,24 +38,3 @@
#include
namespace Faddeeva {
-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.0
-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@ \
-+
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2016-06-21 11:30:41
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2016-06-14
23:07:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-06-21
12:29:16.0 +0200
@@ -1,0 +2,6 @@
+Sat Jun 18 16:52:58 UTC 2016 - dmitr...@opensuse.org
+
+- Fix build with GCC6 [boo#985363]
+ * octave-gcc6.patch
+
+---
New:
octave-gcc6.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.q8qBOA/_old 2016-06-21 12:29:17.0 +0200
+++ /var/tmp/diff_new_pack.q8qBOA/_new 2016-06-21 12:29:17.0 +0200
@@ -57,6 +57,7 @@
Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz
Source2:octave.pc.in
Source3:octave.macros
+Patch1: octave-gcc6.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -200,8 +201,19 @@
This package contains documentation for Octave.
+%if 0%{?suse_version} > 1320
+%if %( echo `rpm -q --queryformat %%{version} gcc` ) > 5
+%define with_gcc6 1
+%endif
+%endif
+
%prep
%setup -q -n %{name}-%{src_ver}
+%if 0%{?with_gcc6}
+%patch1 -p1
+find -name \*.cc -o -name \*.h -o -name \*.yy | xargs sed -i -e 's/#include
/#include <\1.h>/'
+find -name \*.h -o -name \*.cc | xargs sed -i -e 's//"config.h"/' -e
's//"base-list.h"/'
+%endif
%build
export CPPFLAGS="-DH5_USE_16_API"
++ octave-gcc6.patch ++
diff -up octave-4.0.0/libinterp/corefcn/pr-output.cc.abs
octave-4.0.0/libinterp/corefcn/pr-output.cc
--- octave-4.0.0/libinterp/corefcn/pr-output.cc.abs 2015-05-23
08:21:53.0 -0600
+++ octave-4.0.0/libinterp/corefcn/pr-output.cc 2016-02-21 08:59:30.966291273
-0700
@@ -21,7 +21,7 @@ along with Octave; see the file COPYING.
*/
#ifdef HAVE_CONFIG_H
-#include
+#include "config.h"
#endif
#include
@@ -3145,6 +3145,14 @@ PRINT_INT_SCALAR_INTERNAL (uint32_t)
PRINT_INT_SCALAR_INTERNAL (int64_t)
PRINT_INT_SCALAR_INTERNAL (uint64_t)
+inline unsigned int abs (unsigned int x) { return x; }
+inline long unsigned int abs (long unsigned int x) { return x; }
+inline long long unsigned int abs (long long unsigned int x) { return x; }
+inline short unsigned int abs (short unsigned int x) { return x; }
+inline unsigned char abs (unsigned char x) { return x; }
+inline signed char abs (signed char x) { return abs((int)x); }
+inline short int abs (short int x) { return abs((int)x); }
+
template
/* static */ inline void
octave_print_internal_template (std::ostream& os, const intNDArray& nda,
diff -up octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib
octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh
--- octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh.gnulib2015-05-23
08:21:53.0 -0600
+++ octave-4.0.0/liboctave/cruft/Faddeeva/Faddeeva.hh 2016-02-19
19:50:04.693811663 -0700
@@ -27,6 +27,7 @@
#ifndef FADDEEVA_HH
#define FADDEEVA_HH 1
+#include
#include
namespace Faddeeva {
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.0
-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) \
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2016-06-14 23:07:20
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2016-03-26
15:26:48.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-06-14
23:07:24.0 +0200
@@ -1,0 +2,8 @@
+Tue Jun 7 20:05:42 UTC 2016 - dmitr...@opensuse.org
+
+- Update to version 4.0.2
+ * Bugfix release
+- Fix SLE12 config
+- Use update-alternatives mechanism for octave binary
+
+---
Old:
octave-4.0.1.tar.xz
New:
octave-4.0.2.tar.xz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.P1wftU/_old 2016-06-14 23:07:25.0 +0200
+++ /var/tmp/diff_new_pack.P1wftU/_new 2016-06-14 23:07:25.0 +0200
@@ -30,9 +30,6 @@
# Sound IO
%define with_sound 1
-# SLE
-%if 0%{?sles_version}
-
# SLE11
%if 0%{?suse_version} == 1110
%define with_gui 0
@@ -41,16 +38,14 @@
%endif
# SLE12
-%if 0%{?suse_version} == 1315
+%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 0
%define with_gui 0
%define with_jit 0
%define with_imagemagick 1
%endif
-%endif
-
Name: octave
-Version:4.0.1
+Version:4.0.2
Release:0
# Required for RC builds, in this case version contains ~rc, src_ver -rc
%define src_ver %{version}
@@ -141,6 +136,8 @@
BuildRequires: unzip
BuildRequires: zip
Requires: octave-cli = %{version}
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -155,6 +152,8 @@
Summary:Command-line user interface for Octave
Group: Productivity/Scientific/Math
Requires: makeinfo
+Requires(post): update-alternatives
+Requires(preun): update-alternatives
%if 0%{?with_native_graphics}
Recommends: epstool
Recommends: pstoedit
@@ -172,7 +171,7 @@
%packagedevel
Summary:Development files for Octave
Group: Productivity/Scientific/Math
-Requires: %{name} = %{version}
+Requires: %{name}-cli = %{version}
Recommends: blas-devel
Recommends: fftw3-devel
Recommends: fftw3-threads-devel
@@ -260,20 +259,55 @@
%endif
# rpm macros
install -Dm 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm/macros.octave
+# dummy target for update-alternatives
+install -d %{buildroot}/%{_sysconfdir}/alternatives
+ln -s %{name} %{buildroot}/%{_sysconfdir}/alternatives/%{name}
+# move gui binaries
+mv %{buildroot}/%{_bindir}/%{name} %{buildroot}/%{_bindir}/%{name}-gui
+mv %{buildroot}/%{_bindir}/%{name}-%{src_ver}
%{buildroot}/%{_bindir}/%{name}-gui-%{src_ver}
+
+ln -s %{name}-%{src_ver} %{buildroot}/%{_bindir}/%{name}
+ln -s %{name}-cli-%{src_ver} %{buildroot}/%{_bindir}/%{name}-%{src_ver}
%check
make check
%post
+%{_sbindir}/update-alternatives --install %{_bindir}/%{name}-%{src_ver}
%{name} %{_bindir}/%{name}-gui-%{src_ver} 50
/sbin/ldconfig
+%posttrans
+if [ "$1" = 0 ] ; then
+ if ! [ -f %{_bindir}/%{name}-%{src_ver} ] ; then
+ %{_sbindir}/update-alternatives --auto %{name}
+ fi
+fi
+
+%preun
+if [ "$1" = 0 ] ; then
+ %{_sbindir}/update-alternatives --remove %{name}
%{_bindir}/%{name}-gui-%{src_ver}
+fi
+
%postun
/sbin/ldconfig
%post cli
+%{_sbindir}/update-alternatives --install %{_bindir}/%{name}-%{src_ver}
%{name} %{_bindir}/%{name}-cli-%{src_ver} 20
/sbin/ldconfig
%install_info --info-dir=%{_infodir} %{_infodir}/octave.info.gz
+%posttrans cli
+if [ "$1" = 0 ] ; then
+ if ! [ -f %{_bindir}/%{name}-%{src_ver} ] ; then
+ %{_sbindir}/update-alternatives --auto %{name}
+ fi
+fi
+
+%preun cli
+if [ "$1" = 0 ] ; then
+ %{_sbindir}/update-alternatives --remove %{name}
%{_bindir}/%{name}-cli-%{src_ver}
+fi
+
%postun cli
/sbin/ldconfig
%install_info_delete --info-dir=%{_infodir} %{_infodir}/octave.info.gz
@@ -282,9 +316,10 @@
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING NEWS
%doc README ChangeLog
-%{_bindir}/octave
-%{_bindir}/octave-%{src_ver}
-%{_mandir}/man1/octave.1.gz
+%ghost %{_sysconfdir}/alternatives/%{name}
+%ghost %{_bindir}/%{name}-%{src_ver}
+%{_bindir}/%{name}-gui
+%{_bindir}/%{name}-gui-%{src_ver}
%if 0%{?with_gui}
%{_libdir}/%{name}/%{src_ver}/exec/*-*-linux-gnu*/octave-gui
%{_libdir}/%{name}/%{src_ver}/liboctgui.so.*
@@ -299,8 +334,12 @@
%files cli
%defattr(-,root,root)
+%{_bindir}/%{name}
+%ghost %{_bindir}/%{name}-%{src_ver}
+%ghost %{_sysconfdir}/alternatives/%{name}
%{_bindir}/octave-cli
%{_bindir}/octave-cli-%{src_ver}
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2016-03-26 15:26:46
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2015-10-26
12:49:00.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-03-26
15:26:48.0 +0100
@@ -1,0 +2,11 @@
+Tue Mar 22 08:07:58 UTC 2016 - dmitr...@opensuse.org
+
+- Update to version 4.0.1
+ * Bugfix release
+
+---
+Tue Feb 23 18:24:57 CET 2016 - r...@suse.de
+
+- vendor is ibm on s390, not suse
+
+---
Old:
octave-4.0.0.tar.xz
New:
octave-4.0.1.tar.xz
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.8K5EbU/_old 2016-03-26 15:26:49.0 +0100
+++ /var/tmp/diff_new_pack.8K5EbU/_new 2016-03-26 15:26:49.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package octave
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -50,7 +50,7 @@
%endif
Name: octave
-Version:4.0.0
+Version:4.0.1
Release:0
# Required for RC builds, in this case version contains ~rc, src_ver -rc
%define src_ver %{version}
@@ -286,7 +286,7 @@
%{_bindir}/octave-%{src_ver}
%{_mandir}/man1/octave.1.gz
%if 0%{?with_gui}
-%{_libdir}/%{name}/%{src_ver}/exec/*-suse-linux-gnu*/octave-gui
+%{_libdir}/%{name}/%{src_ver}/exec/*-*-linux-gnu*/octave-gui
%{_libdir}/%{name}/%{src_ver}/liboctgui.so.*
%{_datadir}/%{name}/%{src_ver}/locale/
%{_datadir}/appdata/*.xml
@@ -321,7 +321,7 @@
%{_libdir}/%{name}/%{src_ver}/liboctinterp.so.*
%if 0%{?with_gui}
%dir %{_libdir}/%{name}/%{src_ver}/exec/
-%dir %{_libdir}/%{name}/%{src_ver}/exec/*-suse-linux-gnu*/
+%dir %{_libdir}/%{name}/%{src_ver}/exec/*-*-linux-gnu*/
%exclude %{_datadir}/%{name}/%{src_ver}/locale/
%endif
%{_datadir}/octave/
++ octave-4.0.0.tar.xz -> octave-4.0.1.tar.xz ++
/work/SRC/openSUSE:Factory/octave/octave-4.0.0.tar.xz
/work/SRC/openSUSE:Factory/.octave.new/octave-4.0.1.tar.xz differ: char 26,
line 1
commit octave for openSUSE:Factory
Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2015-10-26 12:48:56 Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) Package is "octave" Changes: --- /work/SRC/openSUSE:Factory/octave/octave.changes2015-10-06 13:25:09.0 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2015-10-26 12:49:00.0 +0100 @@ -1,0 +2,6 @@ +Fri Oct 23 12:13:59 UTC 2015 - dval...@suse.com + +- Add disk constraints. Some workers might have enabled build in + tmpfs. Where the space is limited. + +--- New: _constraints Other differences: -- ++ _constraints ++ 7
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2015-10-06 13:25:08
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is "octave"
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2015-07-24
09:59:03.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2015-10-06
13:25:09.0 +0200
@@ -1,0 +2,5 @@
+Sun Sep 13 20:07:51 UTC 2015 - dmitr...@opensuse.org
+
+- Fix desktop menu category
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.5zuyCB/_old 2015-10-06 13:25:10.0 +0200
+++ /var/tmp/diff_new_pack.5zuyCB/_new 2015-10-06 13:25:10.0 +0200
@@ -105,6 +105,7 @@
BuildRequires: hicolor-icon-theme
BuildRequires: libqt4-devel
BuildRequires: qscintilla-devel
+BuildRequires: update-desktop-files
Obsoletes: octave-gui < 4.0
%endif
# Sound IO build requires
@@ -252,6 +253,7 @@
# gui related fixes
%if %{?with_gui}
mv %{buildroot}/%{_datadir}/applications/*octave.desktop
%{buildroot}/%{_datadir}/applications/octave.desktop
+%suse_update_desktop_file -r octave "Science;Math"
%else
rm -rf %{buildroot}/%{_datadir}/icons/hicolor/
rm -rf %{buildroot}/%{_datadir}/appdata/
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2015-07-24 09:59:01
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2015-06-01
09:53:22.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2015-07-24
09:59:03.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul 23 08:19:59 UTC 2015 - dmitr...@opensuse.org
+
+- Add build config for openSUSE:42
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.FpTvMY/_old 2015-07-24 09:59:04.0 +0200
+++ /var/tmp/diff_new_pack.FpTvMY/_new 2015-07-24 09:59:04.0 +0200
@@ -30,6 +30,9 @@
# Sound IO
%define with_sound 1
+# SLE
+%if 0%{?sles_version}
+
# SLE11
%if 0%{?suse_version} == 1110
%define with_gui 0
@@ -44,6 +47,8 @@
%define with_imagemagick 1
%endif
+%endif
+
Name: octave
Version:4.0.0
Release:0
@@ -284,7 +289,7 @@
%{_datadir}/%{name}/%{src_ver}/locale/
%{_datadir}/appdata/*.xml
%{_datadir}/applications/*.desktop
-%if 0%{?suse_version} = 1310
+%if 0%{?suse_version} = 1315
%dir %{_datadir}/appdata
%endif
%{_datadir}/icons/hicolor/*/apps/octave.*
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2015-06-01 09:53:20
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2015-02-24
13:07:16.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2015-06-01
09:53:22.0 +0200
@@ -1,0 +2,12 @@
+Fri May 29 22:08:34 UTC 2015 - dmitr...@opensuse.org
+
+- Update to version 4.0.0
+ * See icluded NEWS file for details
+- Drop obsolete patches:
+ * octave-3.8.0-llvm-3.4.patch
+ * octave-suitesparse-4.4.patch
+ * octave-unzip-info-in-gui.patch
+- Add RPM macros to octave-devel package
+ * octave.macros
+
+---
Old:
octave-3.8.0-llvm-3.4.patch
octave-3.8.2.tar.bz2
octave-suitesparse-4.4.patch
octave-unzip-info-in-gui.patch
New:
octave-4.0.0.tar.xz
octave.macros
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.XUoMIB/_old 2015-06-01 09:53:24.0 +0200
+++ /var/tmp/diff_new_pack.XUoMIB/_new 2015-06-01 09:53:24.0 +0200
@@ -27,6 +27,8 @@
# Image processing library
# Default variant - GraphicsMagick
%define with_imagemagick 0
+# Sound IO
+%define with_sound 1
# SLE11
%if 0%{?suse_version} == 1110
@@ -43,21 +45,18 @@
%endif
Name: octave
-Version:3.8.2
+Version:4.0.0
Release:0
+# Required for RC builds, in this case version contains ~rc, src_ver -rc
+%define src_ver %{version}
Summary:A High Level Programming Language
License:GPL-3.0+
Group: Productivity/Scientific/Math
-%define apiver v49+
+%define apiver v50+
Url:http://www.octave.org/
-Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
+Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{src_ver}.tar.xz
Source2:octave.pc.in
-# PATCH-FIX-UPSTREAM octave-3.8.0-llvm-3.4.patch --
https://savannah.gnu.org/bugs/?41061
-Patch1: octave-3.8.0-llvm-3.4.patch
-# PATCH-FIX-UPSTREAM octave-suitesparse-4.4.patch --
http://savannah.gnu.org/bugs/?43063
-Patch2: octave-suitesparse-4.4.patch
-# PATCH-FIX-UPSTREAM octave-unzip-info-in-gui.patch
-Patch3: octave-unzip-info-in-gui.patch
+Source3:octave.macros
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -73,9 +72,6 @@
BuildRequires: gnuplot
BuildRequires: gperf
BuildRequires: hdf5-devel
-%if 0%{?with_java}
-BuildRequires: java-devel
-%endif
BuildRequires: lapack-devel
%if 0%{?with_imagemagick}
BuildRequires: libMagick++-devel
@@ -84,13 +80,6 @@
%endif
BuildRequires: libcurl-devel
BuildRequires: liblcms-devel
-%if 0%{?with_gui}
-BuildRequires: libqscintilla-devel
-BuildRequires: libqt4-devel
-%endif
-%if 0%{?with_jit}
-BuildRequires: llvm-devel
-%endif
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: qhull-devel
@@ -103,12 +92,32 @@
BuildRequires: texlive-dvips
%endif
BuildRequires: texlive-latex
-BuildRequires: xorg-x11-libSM-devel
-BuildRequires: xorg-x11-libX11-devel
-BuildRequires: xorg-x11-libXext-devel
+BuildRequires: xz
BuildRequires: zlib-devel
+# GUI build requires
+%if 0%{?with_gui}
+BuildRequires: desktop-file-utils
+BuildRequires: hicolor-icon-theme
+BuildRequires: libqt4-devel
+BuildRequires: qscintilla-devel
+Obsoletes: octave-gui 4.0
+%endif
+# Sound IO build requires
+%if 0%{?with_sound}
+BuildRequires: alsa-devel
+BuildRequires: libsndfile-devel
+BuildRequires: portaudio-devel
+%endif
+# JAVA functions build requires
+%if 0%{?with_java}
+BuildRequires: java-devel
+%endif
+# JIT build requires
+%if 0%{?with_jit}
+BuildRequires: llvm-devel
+%endif
+# Native graphics build requires
%if 0%{?with_native_graphics}
-# for native graphics
%if 0%{?suse_version} 1220
BuildRequires: glu-devel
%endif
@@ -116,45 +125,55 @@
BuildRequires: fltk-devel
BuildRequires: fontconfig-devel
BuildRequires: xorg-x11-devel
+BuildRequires: xorg-x11-libSM-devel
+BuildRequires: xorg-x11-libX11-devel
+BuildRequires: xorg-x11-libXext-devel
%else
Requires: gnuplot
%endif
-Requires: makeinfo
-Recommends: blas-devel
-Recommends: fftw3-devel
-Recommends: fftw3-threads-devel
-Recommends: gcc
-Recommends: gcc-fortran
-Recommends: hdf5-devel
-Recommends: make
-Recommends: octave-devel = %{version}
-Recommends: octave-doc = %{version}
-%if 0%{?with_gui}
-Recommends: octave-gui = %{version}
-%endif
+# Tests build requires
+BuildRequires: unzip
+BuildRequires: zip
+Requires:
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2015-02-24 13:02:56
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2014-11-13
09:18:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2015-02-24
13:07:16.0 +0100
@@ -1,0 +2,8 @@
+Mon Feb 23 20:30:07 UTC 2015 - dmitr...@opensuse.org
+
+- Fix unzipping compressed info files when running the gui [boo#918942]
+ * octave-unzip-info-in-gui.patch
+- Disable JIT compilation by default
+- Set build settings for SLE11
+
+---
New:
octave-unzip-info-in-gui.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.K0aC5p/_old 2015-02-24 13:07:17.0 +0100
+++ /var/tmp/diff_new_pack.K0aC5p/_new 2015-02-24 13:07:17.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package octave
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,19 +20,21 @@
%define with_native_graphics 1
# Build GUI
%define with_gui 1
-# JIT support
-# Works only on x86 and x86_64
-%ifarch %ix86 x86_64
-%define with_jit 1
-%else
+# JIT compilation
%define with_jit 0
-%endif
# JAVA support
%define with_java 1
# Image processing library
# Default variant - GraphicsMagick
%define with_imagemagick 0
+# SLE11
+%if 0%{?suse_version} == 1110
+%define with_gui 0
+%define with_jit 0
+%define with_imagemagick 1
+%endif
+
# SLE12
%if 0%{?suse_version} == 1315
%define with_gui 0
@@ -54,6 +56,8 @@
Patch1: octave-3.8.0-llvm-3.4.patch
# PATCH-FIX-UPSTREAM octave-suitesparse-4.4.patch --
http://savannah.gnu.org/bugs/?43063
Patch2: octave-suitesparse-4.4.patch
+# PATCH-FIX-UPSTREAM octave-unzip-info-in-gui.patch
+Patch3: octave-unzip-info-in-gui.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -186,6 +190,7 @@
%if %( echo `rpm -q --queryformat %%{version} suitesparse-devel`| tr -d '.' )
421
%patch2 -p1
%endif
+%patch3
%build
export CPPFLAGS=-DH5_USE_16_API
++ octave-unzip-info-in-gui.patch ++
# HG changeset patch
# User Torsten t...@justmail.de
# Date 1424496143 18000
# Node ID be7b05f95d7c606fd28d6d703d35c64cfdb5e1c9
# Parent a9952a647d52671a38d0fac48bc7831a9ad0065d
fix unzipping compressed info files when running the gui (bug #38305)
* parser.cc (parser::open_file): Use iprocstream instead of QProcess to
handle compressed info files.
Index: libgui/src/qtinfo/parser.cc
===
--- libgui/src/qtinfo/parser.cc.orig2014-08-06 19:57:55.0 +0200
+++ libgui/src/qtinfo/parser.cc 2015-02-23 10:03:37.158505745 +0100
@@ -29,12 +29,12 @@
#endif
#include parser.h
+#include procstream.h
#include QFileInfo
#include QDir
#include QFile
#include QUrl
#include QRegExp
-#include QProcess
#include QBuffer
parser::parser(QObject *p)
@@ -79,13 +79,20 @@
QIODevice *iodevice = 0;
if ( _compressors_map.contains(file_info.suffix ()))
{
- QProcess gzip;
- gzip.start (_compressors_map.value (file_info.suffix ()).arg
(file_info.absoluteFilePath ()));
+ QString command = _compressors_map.value (file_info.suffix ()).arg
(file_info.absoluteFilePath ());
+ iprocstream ips (command.toStdString ());
- if (!gzip.waitForFinished ())
+ if (ips.bad ())
return 0;
- QByteArray result = gzip.readAll ();
+ QByteArray result;
+ char buffer[1024];
+
+ while (! ips.eof ())
+{
+ ips.read (buffer, sizeof (buffer));
+ result.append (buffer, ips.gcount ());
+}
QBuffer *io = new QBuffer (this);
io-setData (result);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2014-11-13 09:18:08
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2014-11-03
13:13:24.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-11-13
09:18:31.0 +0100
@@ -1,0 +2,5 @@
+Wed Nov 12 13:31:29 UTC 2014 - dmitr...@opensuse.org
+
+- Set build settings for SLE12
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.MC8LfW/_old 2014-11-13 09:18:32.0 +0100
+++ /var/tmp/diff_new_pack.MC8LfW/_new 2014-11-13 09:18:32.0 +0100
@@ -19,11 +19,7 @@
# Use native graphics or gnuplot
%define with_native_graphics 1
# Build GUI
-%if 0%{?suse_version} 1110
%define with_gui 1
-%else
-%define with_gui 0
-%endif
# JIT support
# Works only on x86 and x86_64
%ifarch %ix86 x86_64
@@ -31,12 +27,18 @@
%else
%define with_jit 0
%endif
-# old versions don't contain llvm
-%if 0%{?suse_version} 1210
-%define with_jit 0
-%endif
# JAVA support
%define with_java 1
+# Image processing library
+# Default variant - GraphicsMagick
+%define with_imagemagick 0
+
+# SLE12
+%if 0%{?suse_version} == 1315
+%define with_gui 0
+%define with_jit 0
+%define with_imagemagick 1
+%endif
Name: octave
Version:3.8.2
@@ -71,10 +73,10 @@
BuildRequires: java-devel
%endif
BuildRequires: lapack-devel
-%if 0%{?suse_version} 1110
-BuildRequires: libGraphicsMagick++-devel
-%else
+%if 0%{?with_imagemagick}
BuildRequires: libMagick++-devel
+%else
+BuildRequires: libGraphicsMagick++-devel
%endif
BuildRequires: libcurl-devel
BuildRequires: liblcms-devel
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2014-11-03 13:11:59
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2014-10-19
19:28:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-11-03
13:13:24.0 +0100
@@ -1,0 +2,7 @@
+Fri Oct 31 21:36:28 UTC 2014 - dmitr...@opensuse.org
+
+- Fix build with latest SuiteSparse library
+ * octave-suitesparse-4.4.patch
+- Restore SuiteSparse linking hack for openSUSE = 13.1
+
+---
New:
octave-suitesparse-4.4.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.iUJzJX/_old 2014-11-03 13:13:25.0 +0100
+++ /var/tmp/diff_new_pack.iUJzJX/_new 2014-11-03 13:13:25.0 +0100
@@ -48,8 +48,10 @@
Url:http://www.octave.org/
Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
Source2:octave.pc.in
-# PATCH-FIX-UPSTREAM octave-3.8.0-llvm-3.4.patch
https://savannah.gnu.org/bugs/?41061
+# PATCH-FIX-UPSTREAM octave-3.8.0-llvm-3.4.patch --
https://savannah.gnu.org/bugs/?41061
Patch1: octave-3.8.0-llvm-3.4.patch
+# PATCH-FIX-UPSTREAM octave-suitesparse-4.4.patch --
http://savannah.gnu.org/bugs/?43063
+Patch2: octave-suitesparse-4.4.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -172,11 +174,16 @@
%prep
%setup -q
+# check llvm version
%if %{?with_jit} == 1
%if %( echo `rpm -q --queryformat %%{version} llvm-devel`| tr -d '.' ) 33
%patch1 -p1
%endif
%endif
+# check suitesparse library version
+%if %( echo `rpm -q --queryformat %%{version} suitesparse-devel`| tr -d '.' )
421
+%patch2 -p1
+%endif
%build
export CPPFLAGS=-DH5_USE_16_API
@@ -191,6 +198,10 @@
%if %{?with_java} == 0
--disable-java \
%endif
+ %if 0%{?suse_version} = 1310
+ --with-umfpack=-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt
-llapack \
+ --with-cholmod=-lcholmod -lsuitesparseconfig -lrt \
+ %endif
--enable-openmp
make %{?_smp_mflags}
++ octave-suitesparse-4.4.patch ++
# HG changeset patch
# User John W. Eaton j...@octave.org
# Date 1411328708 14400
# Node ID afd6179d2616bfc429a5d24f14d50f01c5e56546
# Parent ebeb3defae373a628ccd11eba69d7bde33855cc7
allow building with new version of SuiteSparse (bug #43063)
* oct-sparse.h (SUITESPARSE_ASSIGN_FPTR, SUITESPARSE_ASSIGN_FPTR2):
New macros.
* amd.cc, symbfact.cc, CSparse.cc, dSparse.cc, sparse-base-chol.cc:
Use as needed.
From Andre da Costa Barros andre.cbar...@yahoo.com.
diff --git a/libinterp/dldfcn/amd.cc b/libinterp/dldfcn/amd.cc
--- a/libinterp/dldfcn/amd.cc
+++ b/libinterp/dldfcn/amd.cc
@@ -164,11 +164,11 @@
// FIXME: how can we manage the memory allocation of amd
//in a cleaner manner?
- amd_malloc = malloc;
- amd_free = free;
- amd_calloc = calloc;
- amd_realloc = realloc;
- amd_printf = printf;
+ SUITESPARSE_ASSIGN_FPTR (malloc_func, amd_malloc, malloc);
+ SUITESPARSE_ASSIGN_FPTR (free_func, amd_free, free);
+ SUITESPARSE_ASSIGN_FPTR (calloc_func, amd_calloc, calloc);
+ SUITESPARSE_ASSIGN_FPTR (realloc_func, amd_realloc, realloc);
+ SUITESPARSE_ASSIGN_FPTR (printf_func, amd_printf, printf);
octave_idx_type result = AMD_NAME (_order) (n_col, cidx, ridx, P,
Control, Info);
diff --git a/libinterp/dldfcn/symbfact.cc b/libinterp/dldfcn/symbfact.cc
--- a/libinterp/dldfcn/symbfact.cc
+++ b/libinterp/dldfcn/symbfact.cc
@@ -114,17 +114,17 @@
if (spu == 0.)
{
cm-print = -1;
- cm-print_function = 0;
+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm-print_function, 0);
}
else
{
cm-print = static_castint (spu) + 2;
- cm-print_function =SparseCholPrint;
+ SUITESPARSE_ASSIGN_FPTR (printf_func, cm-print_function,
SparseCholPrint);
}
cm-error_handler = SparseCholError;
- cm-complex_divide = CHOLMOD_NAME(divcomplex);
- cm-hypotenuse = CHOLMOD_NAME(hypot);
+ SUITESPARSE_ASSIGN_FPTR2 (divcomplex_func, cm-complex_divide, divcomplex);
+ SUITESPARSE_ASSIGN_FPTR2 (hypot_func, cm-hypotenuse, hypot);
double dummy;
cholmod_sparse Astore;
diff --git a/liboctave/array/CSparse.cc b/liboctave/array/CSparse.cc
--- a/liboctave/array/CSparse.cc
+++ b/liboctave/array/CSparse.cc
@@ -5669,17 +5669,17 @@
if (spu == 0.)
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2014-10-19 19:28:00
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2014-08-25
11:05:33.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-10-19
19:28:02.0 +0200
@@ -1,0 +2,5 @@
+Sat Oct 11 08:13:46 UTC 2014 - dmuel...@suse.com
+
+- fix filelist on armv6/7hl: triplet is gnueabi, not gnu
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.zVNKCs/_old 2014-10-19 19:28:05.0 +0200
+++ /var/tmp/diff_new_pack.zVNKCs/_new 2014-10-19 19:28:05.0 +0200
@@ -261,7 +261,7 @@
%{_libdir}/%{name}/%{version}/liboctinterp.so.*
%if 0%{?with_gui}
%dir %{_libdir}/%{name}/%{version}/exec/
-%dir %{_libdir}/%{name}/%{version}/exec/*-suse-linux-gnu/
+%dir %{_libdir}/%{name}/%{version}/exec/*-suse-linux-gnu*/
%exclude %{_datadir}/%{name}/%{version}/locale/
%endif
%{_datadir}/octave/
@@ -272,7 +272,7 @@
%if 0%{?with_gui}
%files gui
%defattr(-,root,root)
-%{_libdir}/%{name}/%{version}/exec/*-suse-linux-gnu/octave-gui
+%{_libdir}/%{name}/%{version}/exec/*-suse-linux-gnu*/octave-gui
%{_libdir}/%{name}/%{version}/liboctgui.so.*
%{_datadir}/%{name}/%{version}/locale/
%endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2014-08-25 11:04:18
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2014-08-16
15:38:15.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-08-25
11:05:33.0 +0200
@@ -1,0 +2,5 @@
+Fri Aug 22 19:11:44 UTC 2014 - dmitr...@opensuse.org
+
+- Move GUI localization files to octave-gui package
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.lcQrVf/_old 2014-08-25 11:05:34.0 +0200
+++ /var/tmp/diff_new_pack.lcQrVf/_new 2014-08-25 11:05:34.0 +0200
@@ -262,6 +262,7 @@
%if 0%{?with_gui}
%dir %{_libdir}/%{name}/%{version}/exec/
%dir %{_libdir}/%{name}/%{version}/exec/*-suse-linux-gnu/
+%exclude %{_datadir}/%{name}/%{version}/locale/
%endif
%{_datadir}/octave/
%{_libdir}/%{name}/site
@@ -273,6 +274,7 @@
%defattr(-,root,root)
%{_libdir}/%{name}/%{version}/exec/*-suse-linux-gnu/octave-gui
%{_libdir}/%{name}/%{version}/liboctgui.so.*
+%{_datadir}/%{name}/%{version}/locale/
%endif
%files devel
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2014-08-16 15:38:00 Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) Package is octave Changes: --- /work/SRC/openSUSE:Factory/octave/octave.changes2014-08-14 14:59:02.0 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-08-16 15:38:15.0 +0200 @@ -1,0 +2,5 @@ +Fri Aug 15 13:58:40 UTC 2014 - dmitr...@opensuse.org + +- Fix runtime dependencies: makeinfo instead of texinfo [bnc#892123] + +--- Other differences: -- ++ octave.spec ++ --- /var/tmp/diff_new_pack.Sy9za0/_old 2014-08-16 15:38:16.0 +0200 +++ /var/tmp/diff_new_pack.Sy9za0/_new 2014-08-16 15:38:16.0 +0200 @@ -111,7 +111,7 @@ %else Requires: gnuplot %endif -Requires: texinfo +Requires: makeinfo Recommends: blas-devel Recommends: fftw3-devel Recommends: fftw3-threads-devel -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2014-08-14 14:58:29
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2014-06-24
15:16:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-08-14
14:59:02.0 +0200
@@ -1,0 +2,7 @@
+Wed Aug 13 17:06:32 UTC 2014 - dmitr...@opensuse.org
+
+- Update to version 3.8.2
+ * Bugfix release, see included ChangeLog file for details
+- Drop suitesparse linking hack [bnc#883683]
+
+---
Old:
octave-3.8.1.tar.bz2
New:
octave-3.8.2.tar.bz2
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.tTWdi7/_old 2014-08-14 14:59:05.0 +0200
+++ /var/tmp/diff_new_pack.tTWdi7/_new 2014-08-14 14:59:05.0 +0200
@@ -39,7 +39,7 @@
%define with_java 1
Name: octave
-Version:3.8.1
+Version:3.8.2
Release:0
Summary:A High Level Programming Language
License:GPL-3.0+
@@ -83,7 +83,6 @@
%if 0%{?with_jit}
BuildRequires: llvm-devel
%endif
-BuildRequires: makeinfo
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: qhull-devel
@@ -134,26 +133,30 @@
%if 0%{?with_gui}
%packagegui
-Summary:Graphical user interface for octave
+Summary:Graphical user interface for Octave
Group: Productivity/Scientific/Math
%descriptiongui
Octave is a high level programming language. It is designed for the
-solution of numeric problems. This package contains official graphical
-user interface.
+solution of numeric problems.
+
+This package contains official graphical user interface.
%endif
%packagedevel
-Summary:Development files for octave
+Summary:Development files for Octave
Group: Productivity/Scientific/Math
Requires: %{name} = %{version}
%descriptiondevel
+Octave is a high level programming language. It is designed for the
+solution of numeric problems.
+
This package contains all necessary include files and libraries needed
-to develop applications that require these.
+to develop applications using Octave.
%packagedoc
-Summary:Documentation for octave
+Summary:Documentation for Octave
Group: Documentation/Other
Requires: %{name} = %{version}
%if 0%{?suse_version} 1110
@@ -161,7 +164,10 @@
%endif
%descriptiondoc
-This package contains documentation for octave.
+Octave is a high level programming language. It is designed for the
+solution of numeric problems.
+
+This package contains documentation for Octave.
%prep
%setup -q
@@ -185,18 +191,17 @@
%if %{?with_java} == 0
--disable-java \
%endif
- --enable-openmp \
- --with-umfpack=-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt
-llapack \
- --with-cholmod=-lcholmod -lsuitesparseconfig -lrt
+ --enable-openmp
make %{?_smp_mflags}
+
# .pc file
cp %{SOURCE2} octave.pc
sed -i 's:@VERSION@:%{version}:' octave.pc
sed -i 's:@LIB@:%{_lib}:' octave.pc
%install
-%makeinstall
+%make_install
# see bnc#557340
mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d
echo %{_libdir}/%{name}/%{version}
%{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
++ octave-3.8.1.tar.bz2 - octave-3.8.2.tar.bz2 ++
/work/SRC/openSUSE:Factory/octave/octave-3.8.1.tar.bz2
/work/SRC/openSUSE:Factory/.octave.new/octave-3.8.2.tar.bz2 differ: char 11,
line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2014-06-24 15:16:00 Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) Package is octave Changes: --- /work/SRC/openSUSE:Factory/octave/octave.changes2014-04-26 10:09:30.0 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-06-24 15:16:07.0 +0200 @@ -1,0 +2,5 @@ +Thu Jun 19 19:45:09 UTC 2014 - dmitr...@opensuse.org + +- Build with FFTW3 multi-threading support + +--- Other differences: -- ++ octave.spec ++ --- /var/tmp/diff_new_pack.1cBR5K/_old 2014-06-24 15:16:09.0 +0200 +++ /var/tmp/diff_new_pack.1cBR5K/_new 2014-06-24 15:16:09.0 +0200 @@ -54,7 +54,7 @@ BuildRequires: bison BuildRequires: blas-devel BuildRequires: dejagnu -BuildRequires: fftw3-devel +BuildRequires: fftw3-threads-devel BuildRequires: flex BuildRequires: freetype2-devel BuildRequires: gcc-c++ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2014-04-26 10:09:29
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2014-03-09
18:27:46.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-04-26
10:09:30.0 +0200
@@ -1,0 +2,5 @@
+Tue Apr 22 16:36:32 UTC 2014 - dmitr...@opensuse.org
+
+- Enable OpenMP support
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.OqYWRG/_old 2014-04-26 10:09:31.0 +0200
+++ /var/tmp/diff_new_pack.OqYWRG/_new 2014-04-26 10:09:31.0 +0200
@@ -185,6 +185,7 @@
%if %{?with_java} == 0
--disable-java \
%endif
+ --enable-openmp \
--with-umfpack=-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt
-llapack \
--with-cholmod=-lcholmod -lsuitesparseconfig -lrt
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2014-03-09 18:27:44
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2014-02-02
18:10:03.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-03-09
18:27:46.0 +0100
@@ -1,0 +2,8 @@
+Fri Mar 7 19:54:29 UTC 2014 - dmitr...@opensuse.org
+
+- Update to version 3.8.1
+ * Bugfix release, see included ChangeLog file for details
+ * removed obsolete octave-3.8.0-gzip-compressed-info.patch
+- Disable JIT support for non-x86 architectures
+
+---
@@ -31 +38,0 @@
-
Old:
octave-3.8.0-gzip-compressed-info.patch
octave-3.8.0.tar.bz2
New:
octave-3.8.1.tar.bz2
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.TKcwGo/_old 2014-03-09 18:27:47.0 +0100
+++ /var/tmp/diff_new_pack.TKcwGo/_new 2014-03-09 18:27:47.0 +0100
@@ -16,17 +16,30 @@
#
+# Use native graphics or gnuplot
%define with_native_graphics 1
+# Build GUI
%if 0%{?suse_version} 1110
%define with_gui 1
%else
%define with_gui 0
%endif
+# JIT support
+# Works only on x86 and x86_64
+%ifarch %ix86 x86_64
%define with_jit 1
+%else
+%define with_jit 0
+%endif
+# old versions don't contain llvm
+%if 0%{?suse_version} 1210
+%define with_jit 0
+%endif
+# JAVA support
%define with_java 1
Name: octave
-Version:3.8.0
+Version:3.8.1
Release:0
Summary:A High Level Programming Language
License:GPL-3.0+
@@ -35,10 +48,8 @@
Url:http://www.octave.org/
Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
Source2:octave.pc.in
-# PATCH-FIX-UPSTREAM octave-3.8.0-gzip-compressed-info.patch bnc#857130
-Patch1: octave-3.8.0-gzip-compressed-info.patch
# PATCH-FIX-UPSTREAM octave-3.8.0-llvm-3.4.patch
https://savannah.gnu.org/bugs/?41061
-Patch2: octave-3.8.0-llvm-3.4.patch
+Patch1: octave-3.8.0-llvm-3.4.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -69,7 +80,9 @@
BuildRequires: libqscintilla-devel
BuildRequires: libqt4-devel
%endif
+%if 0%{?with_jit}
BuildRequires: llvm-devel
+%endif
BuildRequires: makeinfo
BuildRequires: pcre-devel
BuildRequires: pkg-config
@@ -152,9 +165,11 @@
%prep
%setup -q
+
+%if %{?with_jit} == 1
+%if %( echo `rpm -q --queryformat %%{version} llvm-devel`| tr -d '.' ) 33
%patch1 -p1
-%if 0%{?suse_version} 1310
-%patch2 -p1
+%endif
%endif
%build
@@ -164,8 +179,8 @@
%if %{?with_gui} == 0
--disable-gui \
%endif
- %if %{?with_jit} == 0
- --disable-jit \
+ %if %{?with_jit} == 1
+ --enable-jit \
%endif
%if %{?with_java} == 0
--disable-java \
++ octave-3.8.0.tar.bz2 - octave-3.8.1.tar.bz2 ++
/work/SRC/openSUSE:Factory/octave/octave-3.8.0.tar.bz2
/work/SRC/openSUSE:Factory/.octave.new/octave-3.8.1.tar.bz2 differ: char 11,
line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2014-02-02 18:10:02
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2014-01-03
19:47:26.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-02-02
18:10:03.0 +0100
@@ -1,0 +2,6 @@
+Sat Feb 1 08:34:46 UTC 2014 - dmitr...@opensuse.org
+
+- Fix build with LLVM-3.4
+ * octave-3.8.0-llvm-3.4.patch
+
+---
New:
octave-3.8.0-llvm-3.4.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.eaTZR3/_old 2014-02-02 18:10:04.0 +0100
+++ /var/tmp/diff_new_pack.eaTZR3/_new 2014-02-02 18:10:04.0 +0100
@@ -37,6 +37,8 @@
Source2:octave.pc.in
# PATCH-FIX-UPSTREAM octave-3.8.0-gzip-compressed-info.patch bnc#857130
Patch1: octave-3.8.0-gzip-compressed-info.patch
+# PATCH-FIX-UPSTREAM octave-3.8.0-llvm-3.4.patch
https://savannah.gnu.org/bugs/?41061
+Patch2: octave-3.8.0-llvm-3.4.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -151,6 +153,9 @@
%prep
%setup -q
%patch1 -p1
+%if 0%{?suse_version} 1310
+%patch2 -p1
+%endif
%build
export CPPFLAGS=-DH5_USE_16_API
++ octave-3.8.0-llvm-3.4.patch ++
diff -aur octave-3.8.0/libinterp/corefcn/jit-util.h
octave-3.8.0.fix/libinterp/corefcn/jit-util.h
--- octave-3.8.0/libinterp/corefcn/jit-util.h 2013-12-27 15:57:41.0
-0600
+++ octave-3.8.0.fix/libinterp/corefcn/jit-util.h 2014-01-16
17:06:47.512782643 -0600
@@ -42,8 +42,10 @@
{
class Value;
class Module;
- class FunctionPassManager;
- class PassManager;
+ namespace legacy {
+class FunctionPassManager;
+class PassManager;
+ }
class ExecutionEngine;
class Function;
class BasicBlock;
diff -aur octave-3.8.0/libinterp/corefcn/pt-jit.cc
octave-3.8.0.fix/libinterp/corefcn/pt-jit.cc
--- octave-3.8.0/libinterp/corefcn/pt-jit.cc2013-12-27 15:58:17.0
-0600
+++ octave-3.8.0.fix/libinterp/corefcn/pt-jit.cc2014-01-16
17:08:28.030924785 -0600
@@ -52,7 +52,7 @@
#include llvm/Bitcode/ReaderWriter.h
#include llvm/ExecutionEngine/ExecutionEngine.h
#include llvm/ExecutionEngine/JIT.h
-#include llvm/PassManager.h
+#include llvm/IR/LegacyPassManager.h
#ifdef HAVE_LLVM_IR_FUNCTION_H
#include llvm/IR/LLVMContext.h
@@ -1888,10 +1888,10 @@
if (! engine)
return false;
- module_pass_manager = new llvm::PassManager ();
+ module_pass_manager = new llvm::legacy::PassManager ();
module_pass_manager-add (llvm::createAlwaysInlinerPass ());
- pass_manager = new llvm::FunctionPassManager (module);
+ pass_manager = new llvm::legacy::FunctionPassManager (module);
#ifdef HAVE_LLVM_DATALAYOUT
pass_manager-add (new llvm::DataLayout (*engine-getDataLayout ()));
#else
@@ -2007,7 +2007,7 @@
{
std::string error;
llvm::raw_fd_ostream fout (test.bc, error,
- llvm::raw_fd_ostream::F_Binary);
+ llvm::sys::fs::F_Binary);
llvm::WriteBitcodeToFile (module, fout);
}
}
diff -aur octave-3.8.0/libinterp/corefcn/pt-jit.h
octave-3.8.0.fix/libinterp/corefcn/pt-jit.h
--- octave-3.8.0/libinterp/corefcn/pt-jit.h 2013-12-27 15:58:17.0
-0600
+++ octave-3.8.0.fix/libinterp/corefcn/pt-jit.h 2014-01-16 17:05:08.224619116
-0600
@@ -384,8 +384,8 @@
size_t trip_count (const octave_value bounds) const;
llvm::Module *module;
- llvm::PassManager *module_pass_manager;
- llvm::FunctionPassManager *pass_manager;
+ llvm::legacy::PassManager *module_pass_manager;
+ llvm::legacy::FunctionPassManager *pass_manager;
llvm::ExecutionEngine *engine;
};
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2014-01-03 19:47:24
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2013-12-31
10:05:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2014-01-03
19:47:26.0 +0100
@@ -1,0 +2,12 @@
+Thu Jan 2 08:47:14 UTC 2014 - dmitr...@opensuse.org
+
+- Fix loading gzip-compressed info files [bnc#857130]
+ * octave-3.8.0-gzip-compressed-info.patch
+
+---
+Mon Dec 30 07:59:12 UTC 2013 - dmitr...@opensuse.org
+
+- Add octave-gui as recommended dependence
+- Build with jit support
+
+---
New:
octave-3.8.0-gzip-compressed-info.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.ea9X0w/_old 2014-01-03 19:47:27.0 +0100
+++ /var/tmp/diff_new_pack.ea9X0w/_new 2014-01-03 19:47:27.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package octave
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,14 @@
#
-# gnuplot 0 - use native graphics
-%define gnuplot 0
+%define with_native_graphics 1
+%if 0%{?suse_version} 1110
+%define with_gui 1
+%else
+%define with_gui 0
+%endif
+%define with_jit 1
+%define with_java 1
Name: octave
Version:3.8.0
@@ -29,6 +35,8 @@
Url:http://www.octave.org/
Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
Source2:octave.pc.in
+# PATCH-FIX-UPSTREAM octave-3.8.0-gzip-compressed-info.patch bnc#857130
+Patch1: octave-3.8.0-gzip-compressed-info.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -44,7 +52,9 @@
BuildRequires: gnuplot
BuildRequires: gperf
BuildRequires: hdf5-devel
+%if 0%{?with_java}
BuildRequires: java-devel
+%endif
BuildRequires: lapack-devel
%if 0%{?suse_version} 1110
BuildRequires: libGraphicsMagick++-devel
@@ -53,10 +63,11 @@
%endif
BuildRequires: libcurl-devel
BuildRequires: liblcms-devel
-%if 0%{?suse_version} 1110
+%if 0%{?with_gui}
BuildRequires: libqscintilla-devel
BuildRequires: libqt4-devel
%endif
+BuildRequires: llvm-devel
BuildRequires: makeinfo
BuildRequires: pcre-devel
BuildRequires: pkg-config
@@ -74,7 +85,7 @@
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXext-devel
BuildRequires: zlib-devel
-%if %{gnuplot} == 0
+%if 0%{?with_native_graphics}
# for native graphics
%if 0%{?suse_version} 1220
BuildRequires: glu-devel
@@ -84,7 +95,6 @@
BuildRequires: fontconfig-devel
BuildRequires: xorg-x11-devel
%else
-BuildRequires: gnuplot
Requires: gnuplot
%endif
Requires: texinfo
@@ -95,8 +105,11 @@
Recommends: gcc-fortran
Recommends: hdf5-devel
Recommends: make
-Recommends: octave-devel
-Recommends: octave-doc
+Recommends: octave-devel = %{version}
+Recommends: octave-doc = %{version}
+%if 0%{?with_gui}
+Recommends: octave-gui = %{version}
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -104,7 +117,7 @@
solution of numeric problems. There is a command line interface
supplied.
-%if 0%{?suse_version} 1110
+%if 0%{?with_gui}
%packagegui
Summary:Graphical user interface for octave
Group: Productivity/Scientific/Math
@@ -137,14 +150,21 @@
%prep
%setup -q
+%patch1 -p1
%build
export CPPFLAGS=-DH5_USE_16_API
%configure \
--libexecdir=%{_libdir} \
- %if 0%{?suse_version} 1120
+ %if %{?with_gui} == 0
--disable-gui \
%endif
+ %if %{?with_jit} == 0
+ --disable-jit \
+ %endif
+ %if %{?with_java} == 0
+ --disable-java \
+ %endif
--with-umfpack=-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt
-llapack \
--with-cholmod=-lcholmod -lsuitesparseconfig -lrt
@@ -170,13 +190,9 @@
# .pc file
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
cp octave.pc %{buildroot}/%{_libdir}/pkgconfig
-# use native graphics
-# %if %{gnuplot} == 0
-# echo 'graphics_toolkit fltk' %{buildroot}/%{_sysconfdir}/%{name}/octaverc
-# %endif
%check
-make check %{?_smp_mflags}
+make check
%post
/sbin/ldconfig
@@ -186,7 +202,7 @@
/sbin/ldconfig
%install_info_delete --info-dir=%{_infodir} %{_infodir}/octave.info.gz
-%if 0%{?suse_version} 1110
+%if
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2013-12-31 10:05:43
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2013-07-30
16:36:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2013-12-31
10:05:45.0 +0100
@@ -1,0 +2,7 @@
+Sat Dec 28 20:34:15 UTC 2013 - dmitr...@opensuse.org
+
+- Update to version 3.8.0
+ * See included NEWS and ChangeLog files for details
+- Removed obsolete octave-gcc48-mex_remove_externc.patch
+
+---
Old:
octave-3.6.4.tar.bz2
octave-gcc48-mex_remove_externc.patch
New:
octave-3.8.0.tar.bz2
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.xmQ4c9/_old 2013-12-31 10:05:46.0 +0100
+++ /var/tmp/diff_new_pack.xmQ4c9/_new 2013-12-31 10:05:46.0 +0100
@@ -20,17 +20,15 @@
%define gnuplot 0
Name: octave
-Version:3.6.4
+Version:3.8.0
Release:0
Summary:A High Level Programming Language
License:GPL-3.0+
Group: Productivity/Scientific/Math
-%define apiver v48+
+%define apiver v49+
Url:http://www.octave.org/
Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
Source2:octave.pc.in
-#PATCH-FIX-UPSTREAM octave-gcc48-mex_remove_externc.patch - fixes problem when
including mex.h when building packages, upstream changeset 16705:122d3f62e179
-Patch1: octave-gcc48-mex_remove_externc.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -40,14 +38,25 @@
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
+BuildRequires: gl2ps-devel
BuildRequires: glpk-devel
BuildRequires: gmp-devel
+BuildRequires: gnuplot
BuildRequires: gperf
BuildRequires: hdf5-devel
+BuildRequires: java-devel
BuildRequires: lapack-devel
+%if 0%{?suse_version} 1110
+BuildRequires: libGraphicsMagick++-devel
+%else
BuildRequires: libMagick++-devel
+%endif
BuildRequires: libcurl-devel
BuildRequires: liblcms-devel
+%if 0%{?suse_version} 1110
+BuildRequires: libqscintilla-devel
+BuildRequires: libqt4-devel
+%endif
BuildRequires: makeinfo
BuildRequires: pcre-devel
BuildRequires: pkg-config
@@ -95,6 +104,17 @@
solution of numeric problems. There is a command line interface
supplied.
+%if 0%{?suse_version} 1110
+%packagegui
+Summary:Graphical user interface for octave
+Group: Productivity/Scientific/Math
+
+%descriptiongui
+Octave is a high level programming language. It is designed for the
+solution of numeric problems. This package contains official graphical
+user interface.
+%endif
+
%packagedevel
Summary:Development files for octave
Group: Productivity/Scientific/Math
@@ -117,13 +137,17 @@
%prep
%setup -q
-%if 0%{suse_version} = 1210
-%patch1 -p3 -d src
-%endif
%build
export CPPFLAGS=-DH5_USE_16_API
-%configure --libexecdir=%{_libdir} --with-magick=ImageMagick
--with-umfpack=-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt -llapack
--with-cholmod=-lcholmod -lsuitesparseconfig -lrt
+%configure \
+ --libexecdir=%{_libdir} \
+ %if 0%{?suse_version} 1120
+ --disable-gui \
+ %endif
+ --with-umfpack=-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt
-llapack \
+ --with-cholmod=-lcholmod -lsuitesparseconfig -lrt
+
make %{?_smp_mflags}
# .pc file
cp %{SOURCE2} octave.pc
@@ -147,9 +171,9 @@
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
cp octave.pc %{buildroot}/%{_libdir}/pkgconfig
# use native graphics
-%if %{gnuplot} == 0
-echo 'graphics_toolkit fltk' %{buildroot}/%{_sysconfdir}/%{name}/octaverc
-%endif
+# %if %{gnuplot} == 0
+# echo 'graphics_toolkit fltk' %{buildroot}/%{_sysconfdir}/%{name}/octaverc
+# %endif
%check
make check %{?_smp_mflags}
@@ -162,13 +186,28 @@
/sbin/ldconfig
%install_info_delete --info-dir=%{_infodir} %{_infodir}/octave.info.gz
+%if 0%{?suse_version} 1110
+%post gui
+/sbin/ldconfig
+
+%postun gui
+/sbin/ldconfig
+%endif
+
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING NEWS
%doc README ChangeLog
%doc %{_infodir}/*.gz
%doc %{_mandir}/man1/*.gz
-%{_bindir}/*
+%{_bindir}/octave
+%{_bindir}/octave-%{version}
+%{_bindir}/octave-cli
+%{_bindir}/octave-cli-%{version}
+%{_bindir}/mkoctfile
+%{_bindir}/mkoctfile-%{version}
+%{_bindir}/octave-config
+%{_bindir}/octave-config-%{version}
%config %{_sysconfdir}/ld.so.conf.d/%{name}.conf
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/%{version}
@@
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2013-07-30 16:36:33
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2013-05-02
11:28:20.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2013-07-30
16:36:34.0 +0200
@@ -1,0 +2,6 @@
+Sun Jul 28 01:01:01 UTC 2013 - klaussfre...@gmail.com
+
+- Added octave-gcc48-mex_remove_externc, fixes an issue when
+ building packages that include mex.h in gcc 4.8
+
+---
New:
octave-gcc48-mex_remove_externc.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.GOrviQ/_old 2013-07-30 16:36:35.0 +0200
+++ /var/tmp/diff_new_pack.GOrviQ/_new 2013-07-30 16:36:35.0 +0200
@@ -29,6 +29,8 @@
Url:http://www.octave.org/
Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
Source2:octave.pc.in
+#PATCH-FIX-UPSTREAM octave-gcc48-mex_remove_externc.patch - fixes problem when
including mex.h when building packages, upstream changeset 16705:122d3f62e179
+Patch1: octave-gcc48-mex_remove_externc.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -115,6 +117,9 @@
%prep
%setup -q
+%if 0%{suse_version} = 1210
+%patch1 -p3 -d src
+%endif
%build
export CPPFLAGS=-DH5_USE_16_API
++ octave-gcc48-mex_remove_externc.patch ++
# HG changeset patch
# User Clemens Buchacher dri...@aon.at
# Date 1369937542 14400
# Node ID 122d3f62e179ba044d47e58510905719220d8706
# Parent e38a0fa08368d4dd6f3a0dfd20cbe28cf8555f73
do not include C++ header in extern C context (bug #38746)
* mex.h: Include mexproto.h outside of extern C block.
diff --git a/libinterp/interp-core/mex.h b/libinterp/interp-core/mex.h
--- a/libinterp/interp-core/mex.h
+++ b/libinterp/interp-core/mex.h
@@ -64,6 +64,8 @@
#define mxMAXNAME 64
+#include mexproto.h
+
#if defined (__cplusplus)
extern C {
#endif
@@ -74,8 +76,6 @@
void mexFunction (int nlhs, mxArray* plhs[], int nrhs, const mxArray *prhs[]);
#endif
-#include mexproto.h
-
/* V4 floating point routines renamed in V5. */
#define mexIsNaN mxIsNaN
#define mexIsFinite mxIsFinite
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2013-05-02 11:28:19
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2013-03-22
14:03:18.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2013-05-02
11:28:20.0 +0200
@@ -1,0 +2,10 @@
+Wed May 1 15:59:29 UTC 2013 - dmitr...@opensuse.org
+
+- Cleanup recommended packages
+
+---
+Sat Mar 30 15:08:01 UTC 2013 - dmitr...@opensuse.org
+
+- Move documentation to octave-doc package
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.P140Sl/_old 2013-05-02 11:28:22.0 +0200
+++ /var/tmp/diff_new_pack.P140Sl/_new 2013-05-02 11:28:22.0 +0200
@@ -76,18 +76,16 @@
BuildRequires: gnuplot
Requires: gnuplot
%endif
-Requires: gcc-fortran
Requires: texinfo
Recommends: blas-devel
-Recommends: fftw3
Recommends: fftw3-devel
-Recommends: fftw3-threads
Recommends: fftw3-threads-devel
Recommends: gcc
-Recommends: hdf5
-Recommends: libhdf5-devel
+Recommends: gcc-fortran
+Recommends: hdf5-devel
Recommends: make
Recommends: octave-devel
+Recommends: octave-doc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -104,6 +102,17 @@
This package contains all necessary include files and libraries needed
to develop applications that require these.
+%packagedoc
+Summary:Documentation for octave
+Group: Documentation/Other
+Requires: %{name} = %{version}
+%if 0%{?suse_version} 1110
+BuildArch: noarch
+%endif
+
+%descriptiondoc
+This package contains documentation for octave.
+
%prep
%setup -q
@@ -151,10 +160,7 @@
%files
%defattr(-,root,root,-)
%doc AUTHORS BUGS COPYING NEWS
-%doc README ChangeLog etc
-%doc doc/interpreter/octave.pdf doc/liboctave/liboctave.pdf
-%doc doc/refcard/refcard-a4.pdf doc/refcard/refcard-legal.pdf
-%doc doc/refcard/refcard-legal.pdf
+%doc README ChangeLog
%doc %{_infodir}/*.gz
%doc %{_mandir}/man1/*.gz
%{_bindir}/*
@@ -177,4 +183,11 @@
%{_libdir}/%{name}/%{version}/lib*.so
%{_libdir}/%{name}/api-%{apiver}
+%files doc
+%defattr(-,root,root)
+%doc doc/interpreter/octave.pdf
+%doc doc/liboctave/liboctave.pdf
+%doc doc/refcard/refcard-a4.pdf
+%doc doc/refcard/refcard-legal.pdf
+
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2013-03-22 14:03:16
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2013-03-12
22:38:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2013-03-22
14:03:18.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar 14 08:47:02 UTC 2013 - pgaj...@suse.com
+
+- minor spec file adjustment
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.qVKmqm/_old 2013-03-22 14:03:21.0 +0100
+++ /var/tmp/diff_new_pack.qVKmqm/_new 2013-03-22 14:03:21.0 +0100
@@ -39,9 +39,6 @@
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
BuildRequires: glpk-devel
-%if 0%{?suse_version} 1220
-BuildRequires: glu-devel
-%endif
BuildRequires: gmp-devel
BuildRequires: gperf
BuildRequires: hdf5-devel
@@ -68,6 +65,9 @@
BuildRequires: zlib-devel
%if %{gnuplot} == 0
# for native graphics
+%if 0%{?suse_version} 1220
+BuildRequires: glu-devel
+%endif
BuildRequires: Mesa-devel
BuildRequires: fltk-devel
BuildRequires: fontconfig-devel
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2013-03-12 22:38:02
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2013-03-01
10:52:51.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2013-03-12
22:38:04.0 +0100
@@ -1,0 +2,5 @@
+Fri Mar 8 17:25:49 UTC 2013 - dmitr...@opensuse.org
+
+- Fix native graphics support for openSUSE 12.3 [bnc#808530]
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.x9CLhw/_old 2013-03-12 22:38:05.0 +0100
+++ /var/tmp/diff_new_pack.x9CLhw/_new 2013-03-12 22:38:05.0 +0100
@@ -39,6 +39,9 @@
BuildRequires: gcc-c++
BuildRequires: gcc-fortran
BuildRequires: glpk-devel
+%if 0%{?suse_version} 1220
+BuildRequires: glu-devel
+%endif
BuildRequires: gmp-devel
BuildRequires: gperf
BuildRequires: hdf5-devel
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2013-03-01 10:52:50
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2012-12-20
11:03:14.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2013-03-01
10:52:51.0 +0100
@@ -1,0 +2,13 @@
+Thu Feb 28 17:50:30 UTC 2013 - dmitr...@opensuse.org
+
+- Update to version 3.6.4
+ * See included ChangeLog file for details
+- Enable post build tests
+- Enable paralell build
+
+---
+Thu Feb 7 07:54:22 UTC 2013 - dmitr...@opensuse.org
+
+- Enable native graphics
+
+---
Old:
octave-3.6.3.tar.bz2
New:
octave-3.6.4.tar.bz2
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.Z5Oc7a/_old 2013-03-01 10:52:53.0 +0100
+++ /var/tmp/diff_new_pack.Z5Oc7a/_new 2013-03-01 10:52:53.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package octave
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,18 @@
#
-# gnuplot 0 - use native graphics (didn't worked to me, TODO)
+# gnuplot 0 - use native graphics
%define gnuplot 0
Name: octave
-Version:3.6.3
+Version:3.6.4
Release:0
Summary:A High Level Programming Language
License:GPL-3.0+
Group: Productivity/Scientific/Math
%define apiver v48+
Url:http://www.octave.org/
-Source: %{name}-%{version}.tar.bz2
+Source: ftp://ftp.gnu.org/gnu/octave/%{name}-%{version}.tar.bz2
Source2:octave.pc.in
BuildRequires: arpack-ng-devel
BuildRequires: bison
@@ -107,7 +107,7 @@
%build
export CPPFLAGS=-DH5_USE_16_API
%configure --libexecdir=%{_libdir} --with-magick=ImageMagick
--with-umfpack=-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt -llapack
--with-cholmod=-lcholmod -lsuitesparseconfig -lrt
-make
+make %{?_smp_mflags}
# .pc file
cp %{SOURCE2} octave.pc
sed -i 's:@VERSION@:%{version}:' octave.pc
@@ -129,6 +129,13 @@
# .pc file
mkdir -p %{buildroot}/%{_libdir}/pkgconfig
cp octave.pc %{buildroot}/%{_libdir}/pkgconfig
+# use native graphics
+%if %{gnuplot} == 0
+echo 'graphics_toolkit fltk' %{buildroot}/%{_sysconfdir}/%{name}/octaverc
+%endif
+
+%check
+make check %{?_smp_mflags}
%post
/sbin/ldconfig
++ octave-3.6.3.tar.bz2 - octave-3.6.4.tar.bz2 ++
/work/SRC/openSUSE:Factory/octave/octave-3.6.3.tar.bz2
/work/SRC/openSUSE:Factory/.octave.new/octave-3.6.4.tar.bz2 differ: char 11,
line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2012-12-20 11:03:13
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2012-12-14
10:13:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2012-12-20
11:03:14.0 +0100
@@ -1,0 +2,6 @@
+Wed Dec 12 11:42:32 UTC 2012 - pgaj...@suse.com
+
+- install octave.pc file [bnc#793682]
+ + source octave.pc.in
+
+---
New:
octave.pc.in
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.7T7fLS/_old 2012-12-20 11:03:15.0 +0100
+++ /var/tmp/diff_new_pack.7T7fLS/_new 2012-12-20 11:03:15.0 +0100
@@ -28,6 +28,7 @@
%define apiver v48+
Url:http://www.octave.org/
Source: %{name}-%{version}.tar.bz2
+Source2:octave.pc.in
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -107,6 +108,10 @@
export CPPFLAGS=-DH5_USE_16_API
%configure --libexecdir=%{_libdir} --with-magick=ImageMagick
--with-umfpack=-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt -llapack
--with-cholmod=-lcholmod -lsuitesparseconfig -lrt
make
+# .pc file
+cp %{SOURCE2} octave.pc
+sed -i 's:@VERSION@:%{version}:' octave.pc
+sed -i 's:@LIB@:%{_lib}:' octave.pc
%install
%makeinstall
@@ -121,6 +126,9 @@
#
mkdir -p %{buildroot}/%{_libdir}/%{name}/packages
mkdir -p %{buildroot}/%{_datadir}/%{name}/packages
+# .pc file
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
+cp octave.pc %{buildroot}/%{_libdir}/pkgconfig
%post
/sbin/ldconfig
@@ -151,6 +159,7 @@
%{_datadir}/octave/
%{_libdir}/%{name}/site
%config(noreplace) %{_sysconfdir}/%{name}/octaverc
+%{_libdir}/pkgconfig/octave.pc
%files devel
%defattr(-,root,root)
++ octave.pc.in ++
version=@VERSION@
libdir=/usr/@LIB@/octave/${version}
includedir=/usr/include/octave-${version}/octave
Name: octave
Description: A High Level Programming Language
Version: ${version}
Libs: -L${libdir}
Cflags: -I${includedir}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2012-12-14 10:13:36
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2012-10-29
20:07:04.0 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2012-12-14
10:13:36.0 +0100
@@ -1,0 +2,10 @@
+Mon Dec 3 12:44:38 UTC 2012 - pgaj...@suse.com
+
+- local rc file into /etc (Dieter Jurzitza) [bnc#792507]
+
+---
+Mon Oct 30 12:48:58 UTC 2012 - dieter.jurzi...@t-online.de
+
+- add makeinfo to BuildRequires
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.fbD9kR/_old 2012-12-14 10:13:39.0 +0100
+++ /var/tmp/diff_new_pack.fbD9kR/_new 2012-12-14 10:13:39.0 +0100
@@ -45,6 +45,7 @@
BuildRequires: libMagick++-devel
BuildRequires: libcurl-devel
BuildRequires: liblcms-devel
+BuildRequires: makeinfo
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: qhull-devel
@@ -113,13 +114,14 @@
mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d
echo %{_libdir}/%{name}/%{version}
%{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
rm %{buildroot}/%{_libdir}/%{name}/%{version}/*.la
-
+# local rc file into /etc
+mkdir %{buildroot}/%{_sysconfdir}/%{name}
+mv %{buildroot}/%{_datadir}/%{name}/site/m/startup/octaverc
%{buildroot}/%{_sysconfdir}/%{name}
+ln -s %{_sysconfdir}/%{name}/octaverc
%{buildroot}/%{_datadir}/%{name}/site/m/startup/octaverc
+#
mkdir -p %{buildroot}/%{_libdir}/%{name}/packages
mkdir -p %{buildroot}/%{_datadir}/%{name}/packages
-%clean
-rm -rf %{buildroot}
-
%post
/sbin/ldconfig
%install_info --info-dir=%{_infodir} %{_infodir}/octave.info.gz
@@ -143,10 +145,12 @@
%dir %{_libdir}/%{name}/%{version}
%dir %{_libdir}/%{name}/packages
%dir %{_datadir}/%{name}/packages
+%dir %{_sysconfdir}/%{name}
%{_libdir}/%{name}/%{version}/oct
%{_libdir}/%{name}/%{version}/lib*.so.*
%{_datadir}/octave/
%{_libdir}/%{name}/site
+%config(noreplace) %{_sysconfdir}/%{name}/octaverc
%files devel
%defattr(-,root,root)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2012-10-29 20:07:00
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2012-09-23
17:31:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2012-10-29
20:07:04.0 +0100
@@ -1,0 +2,8 @@
+Fri Oct 26 13:24:37 UTC 2012 - badshah...@gmail.com
+
+- Update to version 3.6.3:
+ + Too many bug-fixes to list, see installed CHANGELOG file for a
+list.
+- Drop octave-gets.patch, incorporated upstream.
+
+---
Old:
octave-3.6.2.tar.bz2
octave-gets.patch
New:
octave-3.6.3.tar.bz2
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.oi3TZm/_old 2012-10-29 20:07:06.0 +0100
+++ /var/tmp/diff_new_pack.oi3TZm/_new 2012-10-29 20:07:06.0 +0100
@@ -20,7 +20,7 @@
%define gnuplot 0
Name: octave
-Version:3.6.2
+Version:3.6.3
Release:0
Summary:A High Level Programming Language
License:GPL-3.0+
@@ -28,7 +28,6 @@
%define apiver v48+
Url:http://www.octave.org/
Source: %{name}-%{version}.tar.bz2
-Patch1: octave-gets.patch
BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
@@ -102,7 +101,6 @@
%prep
%setup -q
-%patch1 -p1
%build
export CPPFLAGS=-DH5_USE_16_API
++ octave-3.6.2.tar.bz2 - octave-3.6.3.tar.bz2 ++
/work/SRC/openSUSE:Factory/octave/octave-3.6.2.tar.bz2
/work/SRC/openSUSE:Factory/.octave.new/octave-3.6.3.tar.bz2 differ: char 11,
line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2012-09-23 17:31:32
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2012-09-11
09:13:52.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2012-09-23
17:31:34.0 +0200
@@ -1,0 +2,10 @@
+Tue Sep 18 20:12:09 UTC 2012 - idon...@suse.com
+
+- Add BuildRequires on texinfo (instead of makeinfo) and texlive-dvips
+
+---
+Tue Sep 11 12:24:07 UTC 2012 - pgaj...@suse.com
+
+- fix /etc/ld.so.conf.d/octave.conf [bnc#779072]
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.b6ya72/_old 2012-09-23 17:31:35.0 +0200
+++ /var/tmp/diff_new_pack.b6ya72/_new 2012-09-23 17:31:35.0 +0200
@@ -46,7 +46,6 @@
BuildRequires: libMagick++-devel
BuildRequires: libcurl-devel
BuildRequires: liblcms-devel
-BuildRequires: makeinfo
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: qhull-devel
@@ -54,7 +53,10 @@
BuildRequires: readline-devel
BuildRequires: suitesparse-devel
BuildRequires: termcap
-BuildRequires: texlive-devel
+BuildRequires: texinfo
+%if 0%{?suse_version} 1220
+BuildRequires: texlive-dvips
+%endif
BuildRequires: texlive-latex
BuildRequires: xorg-x11-libSM-devel
BuildRequires: xorg-x11-libX11-devel
@@ -111,7 +113,7 @@
%makeinstall
# see bnc#557340
mkdir -p %{buildroot}/%{_sysconfdir}/ld.so.conf.d
-echo %{_libdir}/%{name}-%{version}
%{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
+echo %{_libdir}/%{name}/%{version}
%{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
rm %{buildroot}/%{_libdir}/%{name}/%{version}/*.la
mkdir -p %{buildroot}/%{_libdir}/%{name}/packages
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2012-09-11 09:13:51
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2012-08-22
14:37:39.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2012-09-11
09:13:52.0 +0200
@@ -1,0 +2,10 @@
+Sat Sep 8 11:09:25 UTC 2012 - idon...@suse.com
+
+- Add explicit build dependency on makeinfo
+
+---
+Tue Aug 21 14:58:30 UTC 2012 - dmi...@roshchin.org
+
+- Change packages directories owner
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.Ft1ddV/_old 2012-09-11 09:14:01.0 +0200
+++ /var/tmp/diff_new_pack.Ft1ddV/_new 2012-09-11 09:14:01.0 +0200
@@ -46,6 +46,7 @@
BuildRequires: libMagick++-devel
BuildRequires: libcurl-devel
BuildRequires: liblcms-devel
+BuildRequires: makeinfo
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: qhull-devel
@@ -113,6 +114,9 @@
echo %{_libdir}/%{name}-%{version}
%{buildroot}/%{_sysconfdir}/ld.so.conf.d/%{name}.conf
rm %{buildroot}/%{_libdir}/%{name}/%{version}/*.la
+mkdir -p %{buildroot}/%{_libdir}/%{name}/packages
+mkdir -p %{buildroot}/%{_datadir}/%{name}/packages
+
%clean
rm -rf %{buildroot}
@@ -137,6 +141,8 @@
%config %{_sysconfdir}/ld.so.conf.d/%{name}.conf
%dir %{_libdir}/%{name}
%dir %{_libdir}/%{name}/%{version}
+%dir %{_libdir}/%{name}/packages
+%dir %{_datadir}/%{name}/packages
%{_libdir}/%{name}/%{version}/oct
%{_libdir}/%{name}/%{version}/lib*.so.*
%{_datadir}/octave/
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2012-08-22 14:37:38
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2012-07-31
13:58:57.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2012-08-22
14:37:39.0 +0200
@@ -1,0 +2,7 @@
+Sun Aug 19 13:54:31 UTC 2012 - sco...@free.fr
+
+- fix umfpack and cholmod linking according to recent suitesparse
+ update
+- enable arpack support
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.xoaXI4/_old 2012-08-22 14:37:40.0 +0200
+++ /var/tmp/diff_new_pack.xoaXI4/_new 2012-08-22 14:37:40.0 +0200
@@ -29,6 +29,7 @@
Url:http://www.octave.org/
Source: %{name}-%{version}.tar.bz2
Patch1: octave-gets.patch
+BuildRequires: arpack-ng-devel
BuildRequires: bison
BuildRequires: blas-devel
BuildRequires: dejagnu
@@ -102,7 +103,7 @@
%build
export CPPFLAGS=-DH5_USE_16_API
-%configure --libexecdir=%{_libdir} --with-magick=ImageMagick
--with-umfpack=-lumfpack -lcholmod -lcolamd -llapack
+%configure --libexecdir=%{_libdir} --with-magick=ImageMagick
--with-umfpack=-lumfpack -lcholmod -lcolamd -lsuitesparseconfig -lrt -llapack
--with-cholmod=-lcholmod -lsuitesparseconfig -lrt
make
%install
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2012-07-31 13:37:17
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2012-06-05
15:33:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2012-07-31
13:58:57.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 29 19:08:14 UTC 2012 - a...@suse.de
+
+- Fix build with missing gets declaration (glibc 2.16)
+
+---
New:
octave-gets.patch
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.qOGYlc/_old 2012-07-31 13:59:35.0 +0200
+++ /var/tmp/diff_new_pack.qOGYlc/_new 2012-07-31 13:59:35.0 +0200
@@ -22,14 +22,17 @@
Name: octave
Version:3.6.2
Release:0
-License:GPL-3.0+
Summary:A High Level Programming Language
+License:GPL-3.0+
+Group: Productivity/Scientific/Math
%define apiver v48+
Url:http://www.octave.org/
-Group: Productivity/Scientific/Math
Source: %{name}-%{version}.tar.bz2
+Patch1: octave-gets.patch
BuildRequires: bison
+BuildRequires: blas-devel
BuildRequires: dejagnu
+BuildRequires: fftw3-devel
BuildRequires: flex
BuildRequires: freetype2-devel
BuildRequires: gcc-c++
@@ -38,25 +41,23 @@
BuildRequires: gmp-devel
BuildRequires: gperf
BuildRequires: hdf5-devel
+BuildRequires: lapack-devel
+BuildRequires: libMagick++-devel
+BuildRequires: libcurl-devel
BuildRequires: liblcms-devel
BuildRequires: pcre-devel
BuildRequires: pkg-config
BuildRequires: qhull-devel
BuildRequires: qrupdate-devel
BuildRequires: readline-devel
+BuildRequires: suitesparse-devel
BuildRequires: termcap
BuildRequires: texlive-devel
BuildRequires: texlive-latex
-BuildRequires: zlib-devel
-BuildRequires: fftw3-devel
-BuildRequires: libMagick++-devel
-BuildRequires: libcurl-devel
BuildRequires: xorg-x11-libSM-devel
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXext-devel
-BuildRequires: suitesparse-devel
-BuildRequires: blas-devel
-BuildRequires: lapack-devel
+BuildRequires: zlib-devel
%if %{gnuplot} == 0
# for native graphics
BuildRequires: Mesa-devel
@@ -97,6 +98,7 @@
%prep
%setup -q
+%patch1 -p1
%build
export CPPFLAGS=-DH5_USE_16_API
++ octave-gets.patch ++
Index: octave-3.6.2/libgnu/stdio.in.h
===
--- octave-3.6.2.orig/libgnu/stdio.in.h
+++ octave-3.6.2/libgnu/stdio.in.h
@@ -717,7 +717,9 @@ _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. */
+# if HAVE_RAW_DECL_GETS
_GL_WARN_ON_USE (gets, gets is a security hole - use fgets instead);
+# endif
#endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community,
here is the log from the commit of package octave for openSUSE:Factory checked
in at 2012-05-22 08:17:05
Comparing /work/SRC/openSUSE:Factory/octave (Old)
and /work/SRC/openSUSE:Factory/.octave.new (New)
Package is octave, Maintainer is pgaj...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/octave/octave.changes2012-05-14
16:17:49.0 +0200
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2012-05-22
08:17:06.0 +0200
@@ -1,0 +2,7 @@
+Fri May 11 05:34:53 UTC 2012 - sco...@free.fr
+
+- remove conditional BuildRequires for blas and lapack since
+ recent lapack now build correctly for all suse version
+- recommends blas - blas-devel
+
+---
Other differences:
--
++ octave.spec ++
--- /var/tmp/diff_new_pack.2cLbUv/_old 2012-05-22 08:17:07.0 +0200
+++ /var/tmp/diff_new_pack.2cLbUv/_new 2012-05-22 08:17:07.0 +0200
@@ -55,13 +55,8 @@
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXext-devel
BuildRequires: suitesparse-devel
-%if 0%{?suse_version} 1130
BuildRequires: blas-devel
BuildRequires: lapack-devel
-%else
-BuildRequires: blas
-BuildRequires: lapack
-%endif
%if %{gnuplot} == 0
# for native graphics
BuildRequires: Mesa-devel
@@ -74,7 +69,7 @@
%endif
Requires: gcc-fortran
Requires: texinfo
-Recommends: blas
+Recommends: blas-devel
Recommends: fftw3
Recommends: fftw3-devel
Recommends: fftw3-threads
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit octave for openSUSE:Factory
Hello community, here is the log from the commit of package octave for openSUSE:Factory checked in at 2012-05-14 16:17:35 Comparing /work/SRC/openSUSE:Factory/octave (Old) and /work/SRC/openSUSE:Factory/.octave.new (New) Package is octave, Maintainer is pgaj...@suse.com Changes: New Changes file: --- /dev/null 2012-05-03 01:24:41.895590051 +0200 +++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2012-05-14 16:17:49.0 +0200 @@ -0,0 +1,515 @@ +--- +Mon Apr 30 09:47:27 UTC 2012 - cfarr...@suse.com + +- license update: GPL-3.0+ + See COPYING - octave is GPL-3.0+ licensed, not GPL-2.0+ + +--- +Mon Apr 16 07:54:18 UTC 2012 - badshah...@gmail.com + +- Spec file cleanup: remove Authors from description, remove + conditionals referring to obsolete suse_versions. + +--- +Fri Apr 13 03:32:53 UTC 2012 - badshah...@gmail.com + +- Modify BuildRequires to match recent name changes of lapack and + blas in project. + +--- +Tue Feb 28 10:12:38 UTC 2012 - pgaj...@suse.com + +- build against fltk (native graphics) +- build against arpack + +--- +Mon Feb 27 12:28:24 UTC 2012 - pgaj...@suse.com + +- updated to 3.6.1: + * removed qhull.patch + +--- +Mon Jan 30 13:01:00 UTC 2012 - pgaj...@suse.com + +- build against 2012.1 + +--- +Mon Jan 9 08:11:27 UTC 2012 - pgaj...@suse.com + +- thanks to Martin Helm: remove octave-umfpack.patch and + use --with-umfpack configure switch instead + +--- +Thu Dec 1 12:48:12 UTC 2011 - pgaj...@suse.com + +- again build against hdf5 + +--- +Tue Nov 15 14:54:24 UTC 2011 - pgaj...@suse.com + +- don't build against hdf5 for now, hdf5 is not building against + 12.1 and Factory + +--- +Mon Oct 24 13:55:37 UTC 2011 - pgaj...@suse.com + +- updated to 3.4.3: + * removed unneeded tar-cond.patch + +--- +Wed Oct 12 10:44:27 UTC 2011 - pgaj...@suse.com + +- build against Mesa-devel and fltk-devel conditional, use gnuplot + rather + +--- +Fri Oct 7 09:10:08 UTC 2011 - pgaj...@suse.com + +- fixed tar(), see + http://trac.imagemagick.org/changeset/5359 + * tar-cond.patch + +--- +Wed Oct 5 12:15:02 UTC 2011 - pgaj...@suse.com + +- build against Mesa-devel, fltk-devel - native graphics +- really build against cxsparse +- build against qrupdate + +--- +Mon Oct 3 09:04:41 UTC 2011 - pgaj...@suse.com + +- really build against umfpack + +--- +Sat Oct 1 20:52:02 UTC 2011 - pgaj...@suse.com + +- build against suitesparse-devel instead of umfpack-devel (umfpack + is part of suitesparse package from now on) + +--- +Tue Sep 20 10:29:19 UTC 2011 - pgaj...@suse.com + +- build against qhull + +--- +Tue Aug 16 15:20:56 UTC 2011 - pgaj...@novell.com + +- linked against umfpack (thanks to Christof Kauffman for + notification) + +--- +Tue Jul 26 13:41:33 UTC 2011 - pgaj...@novell.com + +- updated to 3.4.2 + +--- +Thu Jun 16 11:32:16 UTC 2011 - pgaj...@novell.com + +- updated to 3.4.1 + * no-return-in-nonvoid.patch + +--- +Sun May 29 13:30:00 CET 2011 - werner...@gmx.de + +- fixed hdf5-devel package name + +--- +Tue Feb 15 17:26:36 CET 2011 - pgaj...@suse.cz + +- updated to 3.4.0 + +--- +Thu Jan 13 17:34:51 CET 2011 - pgaj...@suse.cz + +- downgrade back to 3.2.4 stable + +--- +Fri Jan 7 15:40:36 CET 2011 - pgaj...@suse.cz + +- build against GraphicsMagick +- updated to 3.3.54 + +--- +Mon Feb 15 15:22:53 CET 2010 -
