From f60b59552ac02dd402a540441580fe656296271c Mon Sep 17 00:00:00 2001 From: Dmitrij S. Kryzhevich Date: Nov 24 2015 06:44:07 +0000 Subject: New sources --- diff --git a/.gitignore b/.gitignore index 4d53910..bfac1dc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ mathgl-1.10.2.1.tgz /mathgl-2.2.tar.gz /mathgl-2.2.1.tar.gz /mathgl-2.3.tar.gz +/mathgl-2.3.3.tar.gz diff --git a/mathgl.spec b/mathgl.spec index 768145c..90ca4fa 100644 --- a/mathgl.spec +++ b/mathgl.spec @@ -4,8 +4,8 @@ %global with_mpich2 1 Name: mathgl -Version: 2.3 -Release: 11%{?dist} +Version: 2.3.3 +Release: 1%{?dist} Summary: Cross-platform library for making high-quality scientific graphics Summary(de): Plattformübergreifende Bibliothek für hochwertige wissenschaftliche Graphiken Summary(ru): Библиотека для осуществления высококачественной визуализации данных @@ -15,25 +15,28 @@ Url: http://mathgl.sourceforge.net Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz #Mathgl's enable all tries to use hdf4 and 5 at the same time -Patch0: mathgl-2.3-no-hdf4-and-hdf5-simultaneously.patch +Patch0: mathgl-2.3.3-no-hdf4-and-hdf5-simultaneously.patch # Install binaries for generation examples of illustrations -Patch1: mathgl-2.2.1-examples.patch +Patch1: mathgl-2.3.3-examples.patch # There is no easy way to disable ONLY octave. Have to cut it from CmakeList.txt -Patch2: mathgl-2.3-no_octave.patch +Patch2: mathgl-2.3.3-no_octave.patch # Skip FLUID binary test -Patch3: mathgl-2.3-fltk-skip-fluid.patch +Patch3: mathgl-2.3.3-fltk-skip-fluid.patch -# No qt4 and qt5 simultaneously. There are some issues with Qt5, leave v.4 -Patch4: mathgl-2.3-no_qt4.patch +# No qt4 and qt5 simultaneously. +Patch4: mathgl-2.3.3-no_qt4.patch # Fix linking with libX11 -Patch5: mathgl-2.3-x11.patch +Patch5: mathgl-2.3.3-x11.patch # Add missing includes -Patch6: mathgl-2.3-includes.patch +Patch6: mathgl-2.3.3-includes.patch + +# Add support for GSL v.2 and above. Sent to upstream +Patch50: mathgl-2.3.3-gsl2.patch Requires: %{name}-common = %{version}-%{release} @@ -187,6 +190,7 @@ for file in AUTHORS ChangeLog.txt README ; do mv $file.new $file done +%patch0 -b -p1 .gsl2 %patch0 -b .no-hdf4-and-hdf5-simultaneously %patch1 -b .examples %patch2 -b .no_octave @@ -375,6 +379,10 @@ fi %{_includedir}/mpich-%{_arch}/mgl2/ %changelog +* Tue Nov 24 2015 Dsmitrij S. Kryzhevich - 2.3.3-1 +- Update to new 2.3.3 version. +- Fix gsl-2 support. + * Wed Sep 16 2015 Orion Poplawski - 2.3-11 - Rebuild for openmpi 1.10.0 diff --git a/sources b/sources index 4d806ad..5b56349 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -06ce798a1dc82bacc154ff9f63b8f359 mathgl-2.3.tar.gz +c37d6f42d4897675bf89fae635aa6868 mathgl-2.3.3.tar.gz