From 2e8a6db8279c147895dd4e7dccd4fa24be650bb90d19ca862d2b1328150f5da7 Mon Sep 17 00:00:00 2001
From: Dmitry Roshchin <dmitry@roshchin.org>
Date: Mon, 8 Aug 2016 10:59:17 +0000
Subject: [PATCH] Accepting request 417409 from
 home:badshah400:branches:science

- Define macro "octave_enabled" to consistently check when
  octave bindings are disabled (only for openSUSE:Leap:42.1).
- Disable tk bindings also for openSUSE:Leap:42.2 -- it does not
  build because of Xvfb crash (boo#992429).

OBS-URL: https://build.opensuse.org/request/show/417409
OBS-URL: https://build.opensuse.org/package/show/science/plplot?expand=0&rev=69
---
 plplot.changes |  8 ++++++++
 plplot.spec    | 18 ++++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/plplot.changes b/plplot.changes
index ff39a62..60055c5 100644
--- a/plplot.changes
+++ b/plplot.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug  8 07:45:35 UTC 2016 - badshah400@gmail.com
+
+- Define macro "octave_enabled" to consistently check when
+  octave bindings are disabled (only for openSUSE:Leap:42.1).
+- Disable tk bindings also for openSUSE:Leap:42.2 -- it does not
+  build because of Xvfb crash (boo#992429).
+
 -------------------------------------------------------------------
 Sat Aug  6 14:25:12 UTC 2016 - badshah400@gmail.com
 
diff --git a/plplot.spec b/plplot.spec
index 6754c6b..de2cb1d 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -22,12 +22,18 @@
 %define lua_version 5.3
 %endif
 
-%if 0%{?suse_version} > 1320
+%if 0%{?suse_version} > 1320 || (0%{?is_opensuse} && 0%{?sle_version}==120200)
 %define tk_enabled 0
 %else
 %define tk_enabled 1
 %endif
 
+%if 0%{?suse_version} != 1315 || (0%{?is_opensuse} && 0%{?sle_version}==120200)
+%define octave_enabled 1
+%else
+%define octave_enabled 0
+%endif
+
 %define X_display ":98"
 
 Name:           plplot
@@ -527,15 +533,15 @@ cmake \
         -DPL_FREETYPE_FONT_PATH:PATH="%{_datadir}/fonts/truetype" \\\
         -DUSE_RPATH:BOOL=OFF \\\
         -DENABLE_ada:BOOL=ON \\\
-%if 0%{?suse_version} == 1315
-        -DENABLE_octave:BOOL=OFF \\\
-%else
+%if 0%{?octave_enabled}
         -DENABLE_octave:BOOL=ON \\\
         -DTRY_OCTAVE4=ON \\\
+%else
+        -DENABLE_octave:BOOL=OFF \\\
 %endif
         -DENABLE_d:BOOL=ON \\\
         -DENABLE_itcl:BOOL=ON \\\
-%if 0%{?suse_version} > 1320
+%if 0%{?tk_enabled} > 1320
         -DENABLE_itk:BOOL=OFF \\\
         -DENABLE_tk:BOOL=OFF \\\
 %else
@@ -835,7 +841,7 @@ rm -fr %{buildroot}%{_libdir}/libplf95*.a
 %{_libdir}/plplot%{version}/drivers/qt.driver_info
 %{_libdir}/plplot%{version}/drivers/qt.so
 
-%if 0%{?suse_version} != 1315
+%if 0%{?octave_enabled} 
 %files octave
 %defattr(-,root,root)
 %{_datadir}/%{name}_octave/