diff --git a/mathgl-2.3-includes.patch b/mathgl-2.3-includes.patch new file mode 100644 index 0000000..08c16bd --- /dev/null +++ b/mathgl-2.3-includes.patch @@ -0,0 +1,10 @@ +diff -wrupN mathgl-2.3/json/Backend.hpp mathgl-2.3-new/json/Backend.hpp +--- mathgl-2.3/json/Backend.hpp 2014-08-07 14:12:37.000000000 +0200 ++++ mathgl-2.3-new/json/Backend.hpp 2015-07-26 22:48:50.750733852 +0200 +@@ -1,5 +1,6 @@ + #pragma once + ++#include + #include + + class Backend : public QObject diff --git a/mathgl.spec b/mathgl.spec index 757437c..26c7f67 100644 --- a/mathgl.spec +++ b/mathgl.spec @@ -5,7 +5,7 @@ Name: mathgl Version: 2.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Cross-platform library for making high-quality scientific graphics Summary(de): Plattformübergreifende Bibliothek für hochwertige wissenschaftliche Graphiken Summary(ru): Библиотека для осуществления высококачественной визуализации данных @@ -32,12 +32,16 @@ Patch4: mathgl-2.3-no_qt4.patch # Fix linking with libX11 Patch5: mathgl-2.3-x11.patch +# Add missing includes +Patch6: mathgl-2.3-includes.patch + Requires: %{name}-common = %{version}-%{release} # mandatory packages BuildRequires: gsl-devel libpng-devel BuildRequires: desktop-file-utils BuildRequires: cmake +BuildRequires: perl(Storable) # optional packages BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel @@ -135,7 +139,7 @@ prepared by %{name}. Summary: OpenMPI version of %{name} library Group: Applications/Engineering BuildRequires: openmpi-devel -Requires: openmpi +BuildRequires: hdf5-openmpi-devel Requires: %{name}-common = %{version}-%{release} %description openmpi @@ -154,7 +158,7 @@ Requires: %{name}-openmpi%{_isa} = %{version}-%{release} Summary: MPICH version of %{name} library Group: Applications/Engineering BuildRequires: mpich-devel -Requires: mpich +BuildRequires: hdf5-mpich-devel Requires: %{name}-common = %{version}-%{release} Provides: %{name}-mpich2 = %{version}-%{release} Obsoletes: %{name}-mpich2 < 2.1.2-9 @@ -189,6 +193,7 @@ done %patch3 -b .fluid %patch4 -b .no_qt4 %patch5 -b .qt5 +%patch6 -p1 -b .includes # Fix hardcoded paths sed -i s,/usr/local/share/doc/mathgl/,%{_docdir}/%{name}/, udav/udav_wnd.h @@ -370,6 +375,10 @@ fi %{_includedir}/mpich-%{_arch}/mgl2/ %changelog +* Sun Jul 26 2015 Sandro Mani - 2.3-10 +- Rebuild for RPM MPI Requires Provides Change +- Fix FTBFS + * Wed Jun 17 2015 Fedora Release Engineering - 2.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild