[mathgl/f16] * Update to 1.11.3

[mycae]

commit c77e97ac2a32c7a652a629a9bf8dd17a5bc0aef4
Author: D Haley <mycae yahoo com>
Date:   Fri Dec 7 22:33:24 2012 +0000

    * Update to 1.11.3

 ...l-1.11.2-fltk.patch => mathgl-1.11.3-fltk.patch |    0
 mathgl-1.11.3-zlib.patch                           |   20 ++++++++++
 mathgl-hdf4-datatype.patch                         |   18 ---------
 mathgl-info.patch                                  |   20 ----------
 mathgl.spec                                        |   41 ++++++++++++++------
 sources                                            |    2 +-
 6 files changed, 50 insertions(+), 51 deletions(-)
---
diff --git a/mathgl-1.11.2-fltk.patch b/mathgl-1.11.3-fltk.patch
similarity index 100%
rename from mathgl-1.11.2-fltk.patch
rename to mathgl-1.11.3-fltk.patch
diff --git a/mathgl-1.11.3-zlib.patch b/mathgl-1.11.3-zlib.patch
new file mode 100644
index 0000000..25f059a
--- /dev/null
+++ b/mathgl-1.11.3-zlib.patch
@@ -0,0 +1,20 @@
+--- mgl/mgl_data_png.cpp
++++ mgl/mgl_data_png.cpp
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #ifndef NO_PNG
+ #include <png.h>
++#include <zlib.h>
+ #endif
+ #include "mgl/mgl_data.h"
+ #include "mgl/mgl_c.h"
+--- mgl/mgl_export.cpp
++++ mgl/mgl_export.cpp
+@@ -25,6 +25,7 @@
+ #include <stdarg.h>
+ #ifndef NO_PNG
+ #include <png.h>
++#include <zlib.h>
+ #endif
+ #ifdef HAVE_JPEG
+ extern "C" {
diff --git a/mathgl.spec b/mathgl.spec
index 6da3196..026304d 100644
--- a/mathgl.spec
+++ b/mathgl.spec
@@ -1,6 +1,6 @@
 Name: mathgl
-Version: 1.11.2
-Release: 4%{?dist}
+Version: 1.11.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): MathGL - это библиотека для осуществления высококачественной визуализации данных
@@ -9,10 +9,11 @@ Group: Development/Libraries
 Url: http://mathgl.sourceforge.net
 Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 
-#Uncomment mathgl dif listing (fix warning) also from pts
-Patch0: %{name}-info.patch
 #Fltk uses /usr/include/FL
-Patch1: %{name}-%{version}-fltk.patch
+Patch0: %{name}-%{version}-fltk.patch
+#libpng 1.5 no longer include Z_BEST_COMPRESSION, and thus we need to
+# include zlib directly
+Patch1: %{name}-%{version}-zlib.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,9 +77,8 @@ for file in AUTHORS ChangeLog.txt README COPYRIGHT; do
 	mv $file.new $file
 done
 
-%patch0
-%patch1 -p1
-
+%patch0 -p1
+%patch1 
 
 
 %build
@@ -90,9 +90,8 @@ LRELEASE=/usr/bin/lrelease-qt4
 export LDFLAGS="-L/usr/lib64/hdf/ -L/usr/lib/hdf"
 %configure	--disable-static \
 		--enable-shared \
-		--enable-all
+		--enable-all 
 
-#Force strip rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
@@ -146,8 +145,7 @@ if [ $1 = 0 ] ; then
 	/sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
 fi
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -173,6 +171,25 @@ rm -rf $RPM_BUILD_ROOT
 %doc texinfo/docs/*
 
 %changelog
+* Fri Dec 07 2012 <mycae(a!t)yahoo.com> - 1.11.3-1
+- Update to 1.11.3
+
+* Mon Dec 03 2012 Orion Poplawski <orion at cora.nwra.com> - 1.11.2-9
+- Rebuild for hdf5 1.8.10
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri Dec 09 2011 <mycae(a!t)yahoo.com> - 1.11.2-6
+- Fix build fail due to libpng no longer including zlib
+- Remove no longer needed libtool hack
+
+* Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1.11.2-5
+- Rebuild for new libpng
+
 * Thu Jun 23 2011 <mycae(a!t)yahoo.com> - 1.11.2-4
 - Recall why we needed hdf-devel. Its to keep configure happy.
 
diff --git a/sources b/sources
index df50a3d..7e88698 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-acd33e68911d9506f60d769dce23f95e  mathgl-1.11.2.tar.gz
+afd6fc8e9347af7bd222c6941c2d813a  mathgl-1.11.3.tar.gz