diff --git a/.gitignore b/.gitignore index 421fb12..53a2ccc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ mathgl-1.10.2.1.tgz /mathgl-1.11.0.1.tgz +/mathgl-1.11.2.tar.gz diff --git a/mathgl-1.11.0.1-fltk.patch b/mathgl-1.11.0.1-fltk.patch deleted file mode 100644 index 4b22336..0000000 --- a/mathgl-1.11.0.1-fltk.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur mathgl-1.11.0.1.orig/include/mgl/mgl_fltk.h mathgl-1.11.0.1/include/mgl/mgl_fltk.h ---- mathgl-1.11.0.1.orig/include/mgl/mgl_fltk.h 2010-11-13 22:04:11.000000000 +0100 -+++ mathgl-1.11.0.1/include/mgl/mgl_fltk.h 2011-05-31 12:51:46.477338346 +0200 -@@ -29,7 +29,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include diff --git a/mathgl-1.11.2-fltk.patch b/mathgl-1.11.2-fltk.patch new file mode 100644 index 0000000..4b22336 --- /dev/null +++ b/mathgl-1.11.2-fltk.patch @@ -0,0 +1,12 @@ +diff -Naur mathgl-1.11.0.1.orig/include/mgl/mgl_fltk.h mathgl-1.11.0.1/include/mgl/mgl_fltk.h +--- mathgl-1.11.0.1.orig/include/mgl/mgl_fltk.h 2010-11-13 22:04:11.000000000 +0100 ++++ mathgl-1.11.0.1/include/mgl/mgl_fltk.h 2011-05-31 12:51:46.477338346 +0200 +@@ -29,7 +29,7 @@ + #endif + + #include +-#include ++#include + #include + #include + #include diff --git a/mathgl.spec b/mathgl.spec index 5b0edaf..07df654 100644 --- a/mathgl.spec +++ b/mathgl.spec @@ -1,20 +1,18 @@ Name: mathgl -Version: 1.11.0.1 -Release: 6%{?dist} +Version: 1.11.2 +Release: 1%{?dist} Summary: Cross-platform library for making high-quality scientific graphics -Summary(de): Plattformübergreifende Bibliothek für qualitativ hochwertige wissenschaftliche Graphiken +Summary(de): Plattformübergreifende Bibliothek für hochwertige wissenschaftliche Graphiken Summary(ru): MathGL - это библиотека для осуществления высококачественной визуализации данных License: GPLv2+ Group: Development/Libraries Url: http://mathgl.sourceforge.net -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz #Uncomment mathgl dif listing (fix warning) also from pts Patch0: %{name}-info.patch -#Datatype conversion (int->int32) on x86 in hdf4 read func -Patch1: %{name}-hdf4-datatype.patch #Fltk uses /usr/include/FL -Patch2: %{name}-%{version}-fltk.patch +Patch1: %{name}-%{version}-fltk.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,8 +77,7 @@ for file in AUTHORS ChangeLog.txt README COPYRIGHT; do done %patch0 -%patch1 -%patch2 -p1 +%patch1 -p1 @@ -176,6 +173,13 @@ rm -rf $RPM_BUILD_ROOT %doc texinfo/docs/* %changelog +* Wed Jun 01 2011 - 1.11.2-1 +- Update to upstream 1.11.2 + +* Tue May 31 2011 Ralf Corsépius - 1.11.0.1-6 +- Reflect fltk having changed its include directory (Fix FTBS). +- Fix German %%summary. + * Tue May 31 2011 Ralf Corsépius - 1.11.0.1-6 - Reflect fltk having changed its include directory (Fix FTBS). - Fix German %%summary. diff --git a/sources b/sources index edffa2f..df50a3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -790438adb60afd25304d9d2a18c03160 mathgl-1.11.0.1.tgz +acd33e68911d9506f60d769dce23f95e mathgl-1.11.2.tar.gz