science/plplot
SHA256
10
0
Fork 0
forked from pool/plplot
Code Pull Requests Activity

Accepting request 417409 from home:badshah400:branches:science

Browse Source 
- 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
This commit is contained in:
Dmitry Roshchin
2016-08-08 10:59:17 +00:00
committed by Git OBS Bridge
parent f12954ad75
commit 2e8a6db827
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plplot.changes
+8
View File
@@ -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
plplot.spec
+12 -6
View File
@@ -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/