diff --git a/mathgl-1.11.2-fltk.patch b/mathgl-1.11.2-fltk.patch deleted file mode 100644 index 4b22336..0000000 --- a/mathgl-1.11.2-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-zlib.patch b/mathgl-1.11.2-zlib.patch deleted file mode 100644 index 25f059a..0000000 --- a/mathgl-1.11.2-zlib.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mgl/mgl_data_png.cpp -+++ mgl/mgl_data_png.cpp -@@ -20,6 +20,7 @@ - #include - #ifndef NO_PNG - #include -+#include - #endif - #include "mgl/mgl_data.h" - #include "mgl/mgl_c.h" ---- mgl/mgl_export.cpp -+++ mgl/mgl_export.cpp -@@ -25,6 +25,7 @@ - #include - #ifndef NO_PNG - #include -+#include - #endif - #ifdef HAVE_JPEG - extern "C" { diff --git a/mathgl-1.11.3-fltk.patch b/mathgl-1.11.3-fltk.patch new file mode 100644 index 0000000..4b22336 --- /dev/null +++ b/mathgl-1.11.3-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-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 + #ifndef NO_PNG + #include ++#include + #endif + #include "mgl/mgl_data.h" + #include "mgl/mgl_c.h" +--- mgl/mgl_export.cpp ++++ mgl/mgl_export.cpp +@@ -25,6 +25,7 @@ + #include + #ifndef NO_PNG + #include ++#include + #endif + #ifdef HAVE_JPEG + extern "C" { diff --git a/mathgl-info.patch b/mathgl-info.patch deleted file mode 100644 index 3aa92a4..0000000 --- a/mathgl-info.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: mathgl/texinfo/mathgl.texi -=================================================================== ---- texinfo/mathgl_en.texi 2009-03-04 13:22:15.000000000 +0000 -+++ texinfo/mathgl_en.texi 2009-05-27 17:39:59.000000000 +0100 -@@ -25,10 +25,10 @@ - @end quotation - @end copying - --@c @dircategory MathGL documentation system --@c @direntry --@c * MathGL: (mathgl). The library for scientific graphics. --@c @end direntry -+@dircategory MathGL documentation system -+@direntry -+* MathGL: (mathgl). The library for scientific graphics. -+@end direntry - - @titlepage - @title MathGL - diff --git a/mathgl.spec b/mathgl.spec index 3efe40c..026304d 100644 --- a/mathgl.spec +++ b/mathgl.spec @@ -1,6 +1,6 @@ Name: mathgl -Version: 1.11.2 -Release: 7%{?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,13 +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 -Patch2: %{name}-%{version}-zlib.patch +Patch1: %{name}-%{version}-zlib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -79,9 +77,8 @@ for file in AUTHORS ChangeLog.txt README COPYRIGHT; do mv $file.new $file done -%patch0 -%patch1 -p1 -%patch2 +%patch0 -p1 +%patch1 %build @@ -93,7 +90,10 @@ LRELEASE=/usr/bin/lrelease-qt4 export LDFLAGS="-L/usr/lib64/hdf/ -L/usr/lib/hdf" %configure --disable-static \ --enable-shared \ - --enable-all + --enable-all + +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 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/widgets/.libs/:`pwd`/mgl/.libs @@ -145,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 @@ -172,6 +171,15 @@ rm -rf $RPM_BUILD_ROOT %doc texinfo/docs/* %changelog +* Fri Dec 07 2012 - 1.11.3-1 +- Update to 1.11.3 + +* Mon Dec 03 2012 Orion Poplawski - 1.11.2-9 +- Rebuild for hdf5 1.8.10 + +* Thu Jul 19 2012 Fedora Release Engineering - 1.11.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 1.11.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 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