From 74956cd2be24878611b8a0b0345bc9b2342d2416 Mon Sep 17 00:00:00 2001 From: Dmitrij S. Kryzhevich Date: Dec 11 2015 07:18:16 +0000 Subject: Unconditionalize libharu --- diff --git a/mathgl.spec b/mathgl.spec index 02c5214..01eb547 100644 --- a/mathgl.spec +++ b/mathgl.spec @@ -1,16 +1,12 @@ %ifnarch s390 s390x %global with_openmpi 1 %endif -%ifnarch ppc64le ppc64 %global with_mpich2 1 -%endif %global with_doc 1 %if 0%{?fedora} >= 21 %global with_octave 1 %global octpkg mathgl -# No libharu in RHEL/EPEL -%global with_haru 1 %endif %if 0%{?with_doc} @@ -74,9 +70,7 @@ BuildRequires: perl(Storable) BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel BuildRequires: fltk-devel qt5-qtbase-devel qt5-qtwebkit-devel BuildRequires: wxGTK-devel giflib-devel libtool-ltdl-devel -%if 0%{?with_haru} BuildRequires: libharu-devel -%endif BuildRequires: swig lua-devel BuildRequires: libXmu-devel BuildRequires: python2-devel numpy @@ -308,12 +302,6 @@ done %patch5 -b .qt5 %patch6 -b .includes -%if 0%{?with_haru} -# desable pdf support. There is no easy way to disable ONLY pdf support. -sed -i -e 's,.*OPTION(enable-pdf.*,SET(enable-pdf OFF),' -e 's,.*OPTION(enable-doc-prc.*,SET(enable-doc-prc OFF),' CMakeLists.txt -%endif - - # Fix hardcoded paths sed -i s,/usr/local/share/doc/mathgl/,%{_docdir}/%{name}/, udav/udav_wnd.h sed -i s,/usr/local/share/udav/,%{_datadir}/udav/, udav/udav_wnd.cpp @@ -586,6 +574,9 @@ fi %endif %changelog +* Fri Dec 11 2015 Dsmitrij S. Kryzhevich - 2.3.3-6 +- Unconditionalize libharu. It is in epel now. + * Wed Dec 09 2015 Dsmitrij S. Kryzhevich - 2.3.3-5 - Reenable octave module. - Conditionalize doc and mpich subpackages.