diff --git a/mathgl-examples-ldflags.patch b/mathgl-examples-ldflags.patch deleted file mode 100644 index 9f4a29a..0000000 --- a/mathgl-examples-ldflags.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- examples/Makefile.am.org 2010-04-14 22:11:30.868130523 +0100 -+++ examples/Makefile.am 2010-04-14 22:20:08.230133173 +0100 -@@ -8,19 +8,19 @@ - if USE_FLTK - bin_PROGRAMS += mgl_fltk_example - mgl_fltk_example_SOURCES = wnd_samples.cpp fltk_example.cpp --mgl_fltk_example_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la -+mgl_fltk_example_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la $(top_builddir)/mgl/libmgl.la - mgl_fltk_example_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS) - - check_PROGRAMS += test - test_SOURCES = wnd_samples.cpp main.cpp --test_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la -+test_LDADD = $(FLTK_LIBS) $(top_builddir)/widgets/libmgl-fltk.la $(top_builddir)/mgl/libmgl.la - test_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS) - endif - - if USE_GLUT - bin_PROGRAMS += mgl_glut_example - mgl_glut_example_SOURCES = wnd_samples.cpp glut_example.cpp --mgl_glut_example_LDADD = $(top_builddir)/widgets/libmgl-glut.la -+mgl_glut_example_LDADD = $(top_builddir)/widgets/libmgl-glut.la $(top_builddir)/mgl/libmgl.la - endif - - if USE_WX -@@ -36,7 +36,7 @@ - - bin_PROGRAMS += mgl_qt_example - mgl_qt_example_SOURCES = wnd_samples.cpp $(top_builddir)/include/mgl/mgl_qt.moc.cpp $(top_srcdir)/include/mgl/mgl_qt.h qt_example.cpp --mgl_qt_example_LDADD = $(QT_LIBS) $(top_builddir)/widgets/libmgl-qt.la -+mgl_qt_example_LDADD = $(QT_LIBS) $(top_builddir)/widgets/libmgl-qt.la $(top_builddir)/mgl/libmgl.la - mgl_qt_example_LDFLAGS = $(QT_LDFLAGS) - mgl_qt_example_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) - mgl_qt_example_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) diff --git a/mathgl-io.patch b/mathgl-io.patch deleted file mode 100644 index df2f8e0..0000000 --- a/mathgl-io.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- mgl/mgl_data_io.cpp 2009-07-02 01:49:42.000000000 +1000 -+++ mgl/mgl_data_io.cpp.new 2009-07-25 12:16:55.000000000 +1000 -@@ -918,7 +918,7 @@ - hid_t hf,hd,hs; - hsize_t dims[3]; - long rank = 3, res; -- H5Eset_auto(0,0); -+ H5Eset_auto2(0,0,0); - res=H5Fis_hdf5(fname); - if(res>0 && !rewrite) hf = H5Fopen(fname, H5F_ACC_RDWR, H5P_DEFAULT); - else hf = H5Fcreate(fname, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); -@@ -928,10 +928,10 @@ - else { rank = 3; dims[0] = nz; dims[1] = ny; dims[2] = nx; } - hs = H5Screate_simple(rank, dims, 0); - #if(MGL_USE_DOUBLE==1) -- hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT); -+ hd = H5Dcreate(hf, data, H5T_NATIVE_DOUBLE, hs, H5P_DEFAULT,H5P_DEFAULT); - H5Dwrite(hd, H5T_NATIVE_DOUBLE, hs, hs, H5P_DEFAULT, a); - #else -- hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT); -+ hd = H5Dcreate(hf, data, H5T_NATIVE_FLOAT, hs, H5P_DEFAULT,H5P_DEFAULT,H5P_DEFAULT); - H5Dwrite(hd, H5T_NATIVE_FLOAT, hs, hs, H5P_DEFAULT, a); - #endif - H5Dclose(hd); H5Sclose(hs); H5Fclose(hf); -@@ -943,7 +943,7 @@ - hsize_t dims[3]; - long rank; - hf = H5Fopen(fname, H5F_ACC_RDONLY, H5P_DEFAULT); -- hd = H5Dopen(hf,data); -+ hd = H5Dopen(hf,data,H5P_DEFAULT); - hs = H5Dget_space(hd); - rank = H5Sget_simple_extent_ndims(hs); - if(rank>0 && rank<=3) diff --git a/mathgl-mglview-ldflags.patch b/mathgl-mglview-ldflags.patch deleted file mode 100644 index 4c0539e..0000000 --- a/mathgl-mglview-ldflags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- utils/Makefile.am.orig 2010-04-14 22:08:19.024131927 +0100 -+++ utils/Makefile.am 2010-04-14 22:08:40.576140435 +0100 -@@ -21,9 +21,10 @@ - mgl2svg_SOURCES = mgl2svg.cpp - mgl2svg_LDADD = $(top_builddir)/mgl/libmgl.la - -+ - if USE_FLTK - mglview_SOURCES = mglview.cpp --mglview_LDADD = $(top_builddir)/widgets/libmgl-fltk.la -+mglview_LDADD = $(top_builddir)/widgets/libmgl-fltk.la $(top_builddir)/mgl/libmgl.la - mglview_CXXFLAGS = $(FLTK_FLAGS) $(AM_CXXFLAGS) - endif - diff --git a/mathgl-no-mglwx.patch b/mathgl-no-mglwx.patch deleted file mode 100644 index 3e36a42..0000000 --- a/mathgl-no-mglwx.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- examples/Makefile.am 2010-01-02 10:56:23.000000000 +1100 -+++ examples/Makefile.am.new 2010-01-02 10:57:38.000000000 +1100 -@@ -24,10 +24,10 @@ - endif - - if USE_WX --bin_PROGRAMS += mgl_wx_example --mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la --mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS) --mgl_wx_example_SOURCES = wnd_samples.cpp wx_example.cpp -+#bin_PROGRAMS += mgl_wx_example -+#mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la -+#mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS) -+#mgl_wx_example_SOURCES = wnd_samples.cpp wx_example.cpp - endif - - if USE_QT diff --git a/mathgl-novfm-fonts.patch b/mathgl-novfm-fonts.patch deleted file mode 100644 index 02f3ce3..0000000 --- a/mathgl-novfm-fonts.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.am.orig 2010-04-14 22:34:02.671143647 +0100 -+++ Makefile.am 2010-04-14 22:34:07.963146109 +0100 -@@ -13,7 +13,7 @@ - - install-data-local: $(doctargets) - mkdir -p $(mgldest) -- cp -r $(top_srcdir)/fonts/*.vfm $(mgldest) -+# cp -r $(top_srcdir)/fonts/*.vfm $(mgldest) - - uninstall-local: - rm -rf $(mgldest) diff --git a/mathgl-png.patch b/mathgl-png.patch deleted file mode 100644 index 9cd6f48..0000000 --- a/mathgl-png.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- texinfo/png/Makefile.am 2009-07-02 01:50:09.000000000 +1000 -+++ texinfo/png/Makefile.am.new 2009-07-25 12:36:15.000000000 +1000 -@@ -18,7 +18,7 @@ - type2.png vect3.png vectc3.png vectc.png vect.png - - pngdir = $(docdir)/png --png_DATA = all.png $(png_images) -+png_DATA = all.png - CLEANFILES = all.png $(png_images) - all.png: hotdogs.pts - $(top_builddir)/examples/mgl_example diff --git a/mathgl.spec b/mathgl.spec index dc41dda..8508064 100644 --- a/mathgl.spec +++ b/mathgl.spec @@ -1,7 +1,7 @@ %{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)} Name: mathgl -Version: 1.10.2.1 -Release: 3%{?dist} +Version: 1.11.0.1 +Release: 1%{?dist} Summary: Cross-platform library for making high-quality scientific graphics Summary(ru): MathGL - это библиотека для осуществления высококачественной визуализации данных License: GPLv2+ @@ -11,13 +11,8 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz #Uncomment mathgl dif listing (fix warning) also from pts Patch0: %{name}-info.patch -#Remove empty libmgl-wx from compilation -Patch1: %{name}-no-mglwx.patch -#Fix DSO linking in mglview util & examples (linker flags) (2 and 3 reseectively) -Patch2: %{name}-mglview-ldflags.patch -Patch3: %{name}-examples-ldflags.patch -#Remove missing file from install. -Patch4: %{name}-novfm-fonts.patch +#Datatype conversion (int->int32) on x86 in hdf4 read func +Patch1: %{name}-hdf4-datatype.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,7 +21,7 @@ BuildRequires: gsl-devel libpng-devel libtool-ltdl-devel libtool BuildRequires: swig # optional packages -BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel +BuildRequires: freeglut-devel hdf-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel BuildRequires: wxGTK-devel giflib-devel octave-devel #For autoreconf (required for patches, libtool) @@ -85,11 +80,7 @@ done %patch0 %patch1 -%patch2 -%patch3 -%patch4 -autoreconf %build @@ -98,6 +89,7 @@ QMAKE=/usr/bin/qmake-qt4 LUPDATE=/usr/bin/lupdate-qt4 LRELEASE=/usr/bin/lrelease-qt4 +export LDFLAGS="-L/usr/lib64/hdf/ -L/usr/lib/hdf" %configure --disable-static \ --enable-shared \ --enable-all --enable-octave --disable-rpath @@ -137,16 +129,16 @@ echo "pkg load mathgl" > %{name}/PKG_ADD echo "mathgl;" >> %{name}/PKG_ADD #fix wrong version number in description -sed -i 's/1.9/1.10.1/' %{name}/DESCRIPTION +sed -i 's/1.9/1.11.0.1/' %{name}/DESCRIPTION #We cannot use version macro with octave package search, # as pkg.m assumes a x.y.z format for packages. Failing # to do this renders the plugin inoperable -cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.10.1/ +cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.11.0/ #packinfo dir is required, or octave will not find the dir in recursive search -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.10.1/packinfo -cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.10.1/packinfo +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.11.0/packinfo +cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.11.0/packinfo popd @@ -157,7 +149,6 @@ pushd . mkdir -p texinfo/docs cd texinfo/docs/ cp -pr ../mathgl_en.html . -cp -pr ../png_static . cp -pr ../png/ . #remove zero length faux PNG file @@ -179,6 +170,8 @@ do mv $i `echo $i | sed s/mathgl_en/mathgl/` done +rm mgl_*.info* + popd %post @@ -205,8 +198,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so.* %{_bindir}/mgl* %{_datadir}/%{name}/ -%{_prefix}/libexec/octave/packages/%{name}-1.10.1/ -%{_datadir}/octave/packages/%{name}-1.10.1/ +%{_prefix}/libexec/octave/packages/%{name}-1.11.0/ +%{_datadir}/octave/packages/%{name}-1.11.0/ %{_infodir}/%{name}.*.gz %{_infodir}/%{name}_ru.*.gz @@ -221,6 +214,9 @@ rm -rf $RPM_BUILD_ROOT %doc texinfo/docs/* %changelog +* Sat Nov 27 2010 - 1.11.0.1-1 +- Update to 1.11.0.1 + * Sun Aug 08 2010 - 1.10.2.1-3 - Add gsl-devel to requires