Hello community, here is the log from the commit of package mathgl for openSUSE:Factory checked in at 2012-05-29 10:34:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mathgl (Old) and /work/SRC/openSUSE:Factory/.mathgl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mathgl", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/mathgl/mathgl.changes 2012-05-10 14:34:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes 2012-05-29 10:34:05.000000000 +0200 @@ -1,0 +2,26 @@ +Thu May 24 13:15:32 UTC 2012 - badshah...@gmail.com + +- Update to version 2.0.2: + + Add 'U' style for Axis() which disable ticks rotation + + Bugfix for enable-opengl option + + Bugfix for lighting +- Changes from version 2.0.1: + + Improve speed of drawing + + Add reading 3d data files using mglData::ReadMat() + + Exclude unnecessary dependencies/inclusions + + Improve build system: + - Add multithreading + - Add install for Octave + - Separate enable-doc option from enable-all + + Minor bugfixes +- Add mathgl-cmake-enable-doc-option-fix.patch to fix the usage + of the cmake option: enable-doc (sf#3529593) +- Modify existing patch mathgl-fix-python-module-path.patch + to use DESTDIR environment variable instead of RPM_BUILD_ROOT + directly; set DESTDIR during make install stage +- Enable building with hdf5 support: introduces build dependency + on hdf5-devel +- Disable octave bindings for now as they do not build +- Enable building on SLE 11 by turnning off doc building for it. + +------------------------------------------------------------------- Old: ---- mathgl-2.0.tar.gz New: ---- mathgl-2.0.2.tar.gz mathgl-cmake-enable-doc-option-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mathgl.spec ++++++ --- /var/tmp/diff_new_pack.KLVm3P/_old 2012-05-29 10:34:06.000000000 +0200 +++ /var/tmp/diff_new_pack.KLVm3P/_new 2012-05-29 10:34:06.000000000 +0200 @@ -20,7 +20,7 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Name: mathgl -Version: 2.0 +Version: 2.0.2 Release: 0 Summary: Cross-platform library for making high-quality scientific graphics License: GPL-3.0 @@ -33,6 +33,8 @@ Patch1: mathgl-libpath.patch # PATCH-FIX-UPSTREAM mathgl-fix-python-module-path.patch bashah...@gmail.com -- Make python modules install in subdirectories of $RPM_BUILD_ROOT during make install Patch2: mathgl-fix-python-module-path.patch +# PATCH-FIX-UPSTERAM mathgl-cmake-enable-doc-option-fix.patch sf#3529593 badshah...@gmail.com -- Fix the cmake option for enable-doc +Patch3: mathgl-cmake-enable-doc-option-fix.patch BuildRequires: cmake # mathgl's fltk bindings do not build on openSUSE 12.1 and lower %if 0%{?suse_version} > 1210 @@ -42,11 +44,13 @@ BuildRequires: gcc-c++ BuildRequires: giflib-devel BuildRequires: gsl-devel +BuildRequires: hdf5-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libqt4-devel BuildRequires: libtiff-devel BuildRequires: libtool +#BuildRequires: octave-devel BuildRequires: python-devel BuildRequires: python-numpy-devel BuildRequires: swig @@ -122,6 +126,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 #Correct location of numpy/arrayobject.h header file numpy_h=%{python_sitearch}/numpy/core/include/numpy/arrayobject.h @@ -134,20 +139,23 @@ cmake \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DLIB_INSTALL_DIR:PATH=%{_lib} \ - -Denable-ltdl=on \ -Denable-pthread=on \ -Denable-gsl=on \ -Denable-jpeg=on \ -Denable-pdf=off \ -Denable-gif=on \ - -Denable-hdf5_18=off \ + -Denable-hdf5_18=on \ -Denable-opengl=on \ -Denable-glut=on \ -Denable-wx=on \ -Denable-qt=on \ -Denable-python=on \ -Denable-octave=off \ +%if 0%{?sles_version} + -Denable-doc=off \ +%else -Denable-doc=on \ +%endif %if 0%{?suse_version} > 1210 -Denable-fltk=on \ %else @@ -158,20 +166,23 @@ cmake \\\ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DLIB_INSTALL_DIR:PATH=%{_lib} \ - -Denable-ltdl=on \ -Denable-pthread=on \ -Denable-gsl=on \ -Denable-jpeg=on \ -Denable-pdf=off \ -Denable-gif=on \ - -Denable-hdf5_18=off \ + -Denable-hdf5_18=on \ -Denable-opengl=on \ -Denable-glut=on \ -Denable-wx=on \ -Denable-qt=on \ -Denable-python=on \ -Denable-octave=off \ +%if 0%{?sles_version} + -Denable-doc=off \ +%else -Denable-doc=on \ +%endif %if 0%{?suse_version} > 1210 -Denable-fltk=on \ %else @@ -184,9 +195,9 @@ %install %if 0%{suse_version} < 1120 -%makeinstall +%makeinstall DESTDIR=%{buildroot} %else -%make_install +%make_install DESTDIR=%{buildroot} %endif #Remove static library files @@ -205,13 +216,17 @@ %{_bindir}/mgl* %{_bindir}/udav %{_datadir}/%{name}/ +%if 0%{?sles_version} == 0 %{_mandir}/man1/*.gz %{_mandir}/man5/*.gz +%endif +%if 0%{?sles_version} == 0 %files doc %defattr(-,root,root) %dir %{_datadir}/doc/mathgl %{_datadir}/doc/mathgl/* +%endif %files devel %defattr(-,root,root) ++++++ mathgl-2.0.tar.gz -> mathgl-2.0.2.tar.gz ++++++ ++++ 11467 lines of diff (skipped) ++++++ mathgl-cmake-enable-doc-option-fix.patch ++++++ Index: mathgl-2.0.2/CMakeLists.txt =================================================================== --- mathgl-2.0.2.orig/CMakeLists.txt +++ mathgl-2.0.2/CMakeLists.txt @@ -265,7 +265,7 @@ else((enable-langall OR enable-octave) A set(MGL_HAVE_OCTAVE 0) endif((enable-langall OR enable-octave) AND (NOT enable-lgpl) ) -if(enable-all OR doc) +if(enable-all OR enable-doc) set(MGL_HAVE_DOC 1) find_program(findmi makeinfo) if(NOT findmi) @@ -279,9 +279,9 @@ if(enable-all OR doc) if(NOT findtp) message(SEND_ERROR "Couldn't find texi2pdf needed for documentation building.") endif(NOT findtp) -else(enable-all OR doc) +else(enable-all OR enable-doc) set(MGL_HAVE_DOC 0) -endif(enable-all OR doc) +endif(enable-all OR enable-doc) if(MGL_HAVE_PYTHON OR MGL_HAVE_OCTAVE) FIND_PACKAGE(SWIG) ++++++ mathgl-fix-python-module-path.patch ++++++ --- /var/tmp/diff_new_pack.KLVm3P/_old 2012-05-29 10:34:06.000000000 +0200 +++ /var/tmp/diff_new_pack.KLVm3P/_new 2012-05-29 10:34:06.000000000 +0200 @@ -7,7 +7,7 @@ ) add_custom_target(mgl_python_module ALL DEPENDS _mathgl.so mathgl.py) - install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") -+ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} --root=$RPM_BUILD_ROOT WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") ++ install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_BINARY_DIR}/lang/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} --root=\$ENV{DESTDIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/lang )") set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "mgl_wrap.cpp;build;mathgl.pyc") endif(MGL_HAVE_PYTHON) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org