Hello community,

here is the log from the commit of package mathgl for openSUSE:Factory checked 
in at 2015-08-14 14:46:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mathgl (Old)
 and      /work/SRC/openSUSE:Factory/.mathgl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "mathgl"

Changes:
--------
--- /work/SRC/openSUSE:Factory/mathgl/mathgl.changes    2015-06-10 
09:16:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes       2015-08-14 
14:46:44.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Aug 13 11:39:35 UTC 2015 - [email protected]
+
+- Enable Octave module for openSUSE > 13.2
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ mathgl.spec ++++++
--- /var/tmp/diff_new_pack.1ft1Cb/_old  2015-08-14 14:46:45.000000000 +0200
+++ /var/tmp/diff_new_pack.1ft1Cb/_new  2015-08-14 14:46:45.000000000 +0200
@@ -68,7 +68,9 @@
 BuildRequires:  libtiff-devel
 BuildRequires:  libtool
 BuildRequires:  lua51-devel
-# BuildRequires:  octave-devel
+%if 0%{?suse_version} > 1320
+BuildRequires:  octave-devel
+%endif
 BuildRequires:  openmpi-devel
 BuildRequires:  python-devel
 BuildRequires:  python-numpy-devel
@@ -105,8 +107,10 @@
 Summary:        MathGL is a cross-platform library for making high-quality 
scientific graphics
 Group:          System/Libraries
 Requires:       %{name}-fonts >= %{version}
-# FIXME temporary, octave-mathgl is inconsistent with octave 4.0
+# FIXME temporary, octave-mathgl is inconsistent with octave 4.0 due to SWIG
+%if 0%{?suse_version} <= 1320
 Obsoletes:      octave-mathgl
+%endif
 
 %description -n %{libname}%{libversion}
 MathGL is a cross-platform library for making high-quality scientific
@@ -319,19 +323,21 @@
 
 This package provides lua interface for MathGL.
 
-# %%package -n     octave-mathgl
-# Summary:        Octave interface for MathGL library
-# Group:          Productivity/Scientific/Other
-# Requires:       octave
-# 
-# %%description -n octave-mathgl
-# MathGL is a cross-platform library for making high-quality scientific
-# graphics. It provides fast data plotting and handling of large data
-# arrays, as well as  window and console modes and for easy embedding
-# into other programs. MathGL integrates into FLTK, Qt and
-# OpenGL applications.
-# 
-# This package provides Octave interface for MathGL.
+%if 0%{?suse_version} > 1320
+%package -n     octave-mathgl
+Summary:        Octave interface for MathGL library
+Group:          Productivity/Scientific/Other
+Requires:       octave
+
+%description -n octave-mathgl
+MathGL is a cross-platform library for making high-quality scientific
+graphics. It provides fast data plotting and handling of large data
+arrays, as well as  window and console modes and for easy embedding
+into other programs. MathGL integrates into FLTK, Qt and
+OpenGL applications.
+
+This package provides Octave interface for MathGL.
+%endif
 
 %package -n     python-mathgl
 Summary:        Libraries and header files for MathGL library
@@ -453,7 +459,11 @@
       %endif
       -Denable-python=on                      \
       -Denable-lua=on                         \
+      %if 0%{?suse_version} > 1320
+      -Denable-octave=on                      \
+      %else
       -Denable-octave=off                     \
+      %endif
       -Denable-octave-install=off             \
       -Denable-mgltex=on                      \
       -Denable-doc-html=on                    \
@@ -468,14 +478,16 @@
 %install
 %make_install
 
-# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%%{buildroot}%%{_libdir}
-# # # Install octave-mathgl
-# mkdir -p %%{buildroot}%%{_libdir}/octave/packages
-# mkdir -p %%{buildroot}%%{_datadir}/octave/packages
-# octave %%{octave_args} --eval "pkg prefix 
%%{buildroot}%%{_datadir}/octave/packages 
%%{buildroot}%%{_libdir}/octave/packages; pkg install lang/%%{name}.tar.gz"
-# # rm %%{buildroot}%%{_datadir}/octave/packages/*/packinfo/.autoload
-# # remove octave module archive
-# rm %%{buildroot}%%{_datadir}/%%{name}/%%{name}.tar.gz
+%if 0%{?suse_version} > 1320
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{buildroot}%{_libdir}
+# # Install octave-mathgl
+mkdir -p %{buildroot}%{_libdir}/octave/packages
+mkdir -p %{buildroot}%{_datadir}/octave/packages
+octave %{octave_args} --eval "pkg prefix 
%{buildroot}%{_datadir}/octave/packages %{buildroot}%{_libdir}/octave/packages; 
pkg install lang/%{name}.tar.gz"
+# rm %%{buildroot}%%{_datadir}/octave/packages/*/packinfo/.autoload
+# remove octave module archive
+rm %{buildroot}%{_datadir}/%{name}/%{name}.tar.gz
+%endif
 
 # Install docs
 install -m 644 {AUTHORS,ChangeLog.txt,README,COPYING} 
%{buildroot}%{_docdir}/%{name}/
@@ -538,12 +550,12 @@
 
 %postun -n %{libname}-wx%{libversion} -p /sbin/ldconfig
 
-%if 0
-# %%post -n octave-mathgl
-# octave -qf %%{octave_args} --eval "pkg rebuild -auto mathgl"
+%if 0%{?suse_version} > 1320
+%post -n octave-mathgl
+octave -qf %{octave_args} --eval "pkg rebuild -auto mathgl"
 
-# %%postun -n octave-mathgl
-# octave -qf %%{octave_args} --eval "pkg rebuild"
+%postun -n octave-mathgl
+octave -qf %{octave_args} --eval "pkg rebuild"
 %endif
 
 %post tex
@@ -654,10 +666,12 @@
 %defattr(-,root,root)
 %{_libdir}/mgl-lua.so
 
-# %%files -n octave-mathgl
-# %%defattr(-,root,root)
-# %%{_datadir}/octave/packages/%%{name}-%%{oct_version}/
-# %%{_libdir}/octave/packages/%%{name}-%%{oct_version}/
+%if 0%{?suse_version} > 1320
+%files -n octave-mathgl
+%defattr(-,root,root)
+%{_datadir}/octave/packages/%{name}-%{oct_version}/
+%{_libdir}/octave/packages/%{name}-%{oct_version}/
+%endif
 
 %files -n python-mathgl
 %defattr(-,root,root)


Reply via email to