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.changes 2016-03-26
15:26:48.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.octave.new/octave.changes 2016-06-14
23:07:24.000000000 +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.000000000 +0200
+++ /var/tmp/diff_new_pack.P1wftU/_new 2016-06-14 23:07:25.000000000 +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 @@
%package devel
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}
+%{_mandir}/man1/octave.1.gz
%{_mandir}/man1/octave-cli.1.gz
%{_bindir}/mkoctfile
%{_bindir}/mkoctfile-%{src_ver}
++++++ octave-4.0.1.tar.xz -> octave-4.0.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/octave/octave-4.0.1.tar.xz
/work/SRC/openSUSE:Factory/.octave.new/octave-4.0.2.tar.xz differ: char 26,
line 1
