Hello community,
here is the log from the commit of package mathgl for openSUSE:Factory checked
in at 2012-12-03 16:37:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-29
10:34:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes 2012-12-03
16:38:07.000000000 +0100
@@ -1,0 +2,54 @@
+Thu Nov 15 15:13:01 UTC 2012 - rene.vanpaas...@gmail.com
+
+- Fix spec file for build on Fedora:
+ * add dependencies (xmu, texi2html, texinfo-tex)
+ * re-define _defaultdocdir, to reflect correct doc path
+ * correct test for suse_version
+
+-------------------------------------------------------------------
+Wed Oct 17 19:45:11 UTC 2012 - dmi...@roshchin.org
+
+- Locate documentation to right place
+ * mathgl-doc-path.patch
+- Update post and postup for octave-mathgl
+
+-------------------------------------------------------------------
+Fri Aug 24 15:34:59 UTC 2012 - dmi...@roshchin.org
+
+- Fix octave-mathgl package installation
+
+-------------------------------------------------------------------
+Tue Aug 21 14:58:30 UTC 2012 - dmi...@roshchin.org
+
+- Add octave-mathgl package
+- Add mathgl-examples package
+
+-------------------------------------------------------------------
+Sun Jul 29 12:18:55 UTC 2012 - badshah...@gmail.com
+
+- Update to version 2.0.3:
+ + Make code compilable by compilers GNU/MinGW GCC, Clang, MS
+ VisualStudio
+ + Add mglTriangulation() using s_hull_pro algorithm
+ + Add mglData::Grid() and mglGraph::DataGrid() for filling
+ regular data by values of triangulated surface
+ + Add cmake options ’enable-png’ and ’enable-zlib’
+ + Add SetTimeUTC() for using UTC time instead of local one
+ + Add SetTickShift() for additional shift of tick labels
+ + Add mglGraph::MPI_Send() and mglGraph::MPI_Recv()
+ + Vector plots now draw vector at edges, which are directed out
+ of bounding box
+ + Add gap between 1d plots for avoiding possible undetermined
+ overlapping
+ + Add parallel build for documentation
+ + Bugfixes for memory leaks and uninitialized variables, for
+ setting text size, for handling NAN color value, for missing
+ lines in export to EPS/SVG
+- Drop mathgl-cmake-enable-doc-option-fix.patch; implemented
+ upstream
+- Split udav into its own package
+- Add %suse_update_desktop_file for SLE to fix brp complaints
+ about missing generic name for udav.desktop
+- Add install-info post scriplets for the installed info files.
+
+-------------------------------------------------------------------
Old:
----
mathgl-2.0.2.tar.gz
mathgl-cmake-enable-doc-option-fix.patch
New:
----
mathgl-2.0.3.tar.gz
mathgl-doc-path.patch
mathgl-examples-install.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mathgl.spec ++++++
--- /var/tmp/diff_new_pack.7o7HKC/_old 2012-12-03 16:38:08.000000000 +0100
+++ /var/tmp/diff_new_pack.7o7HKC/_new 2012-12-03 16:38:08.000000000 +0100
@@ -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.2
+Version: 2.0.3
Release: 0
Summary: Cross-platform library for making high-quality scientific
graphics
License: GPL-3.0
@@ -33,8 +33,10 @@
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
+# PATCH-FEATURE-UPSTREAM mathgl-examples-install.patch -- Enable examples
install
+Patch3: mathgl-examples-install.patch
+# PATCH-FIX-OPENSUSE mathgl-doc-path.patch -- Locate documentation to right
place
+Patch4: mathgl-doc-path.patch
BuildRequires: cmake
# mathgl's fltk bindings do not build on openSUSE 12.1 and lower
%if 0%{?suse_version} > 1210
@@ -50,21 +52,34 @@
BuildRequires: libqt4-devel
BuildRequires: libtiff-devel
BuildRequires: libtool
-#BuildRequires: octave-devel
+%if 0%{?suse_version} >= 1210
+BuildRequires: octave-devel
+%endif
BuildRequires: python-devel
BuildRequires: python-numpy-devel
BuildRequires: swig
BuildRequires: texinfo
BuildRequires: texlive-latex
-%if %suse_version >= 1140
+%if 0%{?suse_version} >= 1140
BuildRequires: wxWidgets-devel
%define _use_internal_dependency_generator 0
%define __find_requires %wx_requires
%else
BuildRequires: wxGTK-devel
%endif
+%if 0%{?sles_version}
+BuildRequires: update-desktop-files
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version}
Recommends: %{name}-doc
+%endif
+%if 0%{?fedora_version}
+BuildRequires: libXmu-devel
+BuildRequires: texi2html
+BuildRequires: texinfo-tex
+%define _defaultdocdir %{_datadir}/doc/packages
+%endif
%description
Mathgl is a cross-platform library for making high-quality scientific
@@ -90,11 +105,29 @@
This package contains libraries and header files for developing
applications that use mathgl.
+%package examples
+
+Summary: Examples for %{name} library
+Group: Productivity/Scientific/Other
+Requires: %{name} = %{version}
+
+%description examples
+Mathgl is a cross-platform library for making high-quality scientific
+graphics. It provides fast data plotting and handling of large data
+arrays, as well as window and console modes and for easy embedding
+into other programs. Mathgl integrates into fltk, qt and
+opengl applications.
+
+This package contains examples of using mathgl.
+
%package doc
Summary: Documentation for %{name}
Group: Documentation/Other
Requires: %{name} = %{version}
+%if 0%{?sles_version} == 0
+BuildArch: noarch
+%endif
%description doc
Mathgl is a cross-platform library for making high-quality scientific
@@ -121,12 +154,43 @@
This package provides the python bindings for mathgl.
+%if 0%{?suse_version} >= 1210
+%package -n octave-mathgl
+
+Summary: Octave interface for %{name} library
+Group: Productivity/Scientific/Other
+Requires: %{name} = %{version}
+Requires: octave
+
+%description -n octave-mathgl
+Mathgl is a cross-platform library for making high-quality scientific
+graphics. It provides fast data plotting and handling of large data
+arrays, as well as window and console modes and for easy embedding
+into other programs. Mathgl integrates into fltk, qt and
+opengl applications.
+
+This package provides octave interface for mathgl.
+%endif
+
+%package -n udav
+
+Summary: Libraries and header files for %{name} library
+Group: Productivity/Scientific/Other
+Requires: %{name} = %{version}
+
+%description -n udav
+This package provides the udav application for mathgl.
+
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
+# Correct octave-mathgl version
+sed -i 's/2.0/%{version}/' lang/DESCRIPTION
#Correct location of numpy/arrayobject.h header file
numpy_h=%{python_sitearch}/numpy/core/include/numpy/arrayobject.h
@@ -150,7 +214,9 @@
-Denable-wx=on \
-Denable-qt=on \
-Denable-python=on \
- -Denable-octave=off \
+%if 0%{?suse_version} >= 1210
+ -Denable-octave=on \
+%endif
%if 0%{?sles_version}
-Denable-doc=off \
%else
@@ -177,7 +243,9 @@
-Denable-wx=on \
-Denable-qt=on \
-Denable-python=on \
- -Denable-octave=off \
+%if 0%{?suse_version} >= 1210
+ -Denable-octave=on \
+%endif
%if 0%{?sles_version}
-Denable-doc=off \
%else
@@ -194,39 +262,75 @@
make
%install
-%if 0%{suse_version} < 1120
+%if 0%{?suse_version} && 0%{?suse_version} < 1120
%makeinstall DESTDIR=%{buildroot}
%else
%make_install DESTDIR=%{buildroot}
%endif
-#Remove static library files
+# Install octave-mathgl
+%if 0%{?suse_version} >= 1210
+mkdir -p %{buildroot}%{_libdir}/octave/packages
+mkdir -p %{buildroot}%{_datadir}/octave/packages
+export LD_LIBRARY_PATH="%{buildroot}%{_libdir}/"
+octave --eval "pkg prefix %{buildroot}%{_datadir}/octave/packages
%{buildroot}%{_libdir}/octave/packages; pkg install lang/%{name}.tar.gz"
+rm %{buildroot}%{_datadir}/octave/packages/*/packinfo/.autoload
+%endif
+
+# Remove static library files
rm %{buildroot}/%{_libdir}/*.a
+%if 0%{?sles_version}
+%suse_update_desktop_file UDAV -G "Data handling and plotting tool"
+%endif
+
+# Install docs
+%if 0%{?sles_version}
+install -d %{buildroot}%{_docdir}/%{name}/
+%endif
+install -m 644 {AUTHORS,ChangeLog.txt,README,COPYING}
%{buildroot}%{_docdir}/%{name}/
+
%post
/sbin/ldconfig
+%install_info --info-dir=%{_infodir} %{_infodir}/*.info.gz
%postun
/sbin/ldconfig
+%install_info_delete --info-dir=%_infodir %{_infodir}/*.info.gz
+
+%if 0%{?suse_version} >= 1210
+%post -n octave-mathgl
+octave -qf --eval "pkg rebuild -auto mathgl"
+
+%postun -n octave-mathgl
+octave -qf --eval "pkg rebuild"
+%endif
%files
%defattr(-,root,root)
-%doc AUTHORS ChangeLog.txt README COPYING
%{_libdir}/*.so.*
-%{_bindir}/mgl*
-%{_bindir}/udav
+%{_bindir}/mglconv
+%{_bindir}/mglview
%{_datadir}/%{name}/
%if 0%{?sles_version} == 0
+%{_infodir}/*.gz
%{_mandir}/man1/*.gz
%{_mandir}/man5/*.gz
%endif
-%if 0%{?sles_version} == 0
+%files -n udav
+%defattr(-,root,root)
+%{_bindir}/udav
+%{_datadir}/pixmaps/udav.png
+%{_datadir}/applications/UDAV.desktop
+
%files doc
%defattr(-,root,root)
-%dir %{_datadir}/doc/mathgl
-%{_datadir}/doc/mathgl/*
-%endif
+%doc %{_defaultdocdir}/mathgl/
+
+%files examples
+%defattr(-,root,root)
+%{_bindir}/mgl*example
%files devel
%defattr(-,root,root)
@@ -237,4 +341,11 @@
%defattr(-,root,root)
%{python_sitearch}/*
+%if 0%{?suse_version} >= 1210
+%files -n octave-mathgl
+%defattr(-,root,root)
+%{_datadir}/octave/packages/%{name}-%{version}/
+%{_libdir}/octave/packages/%{name}-%{version}/
+%endif
+
%changelog
++++++ mathgl-2.0.2.tar.gz -> mathgl-2.0.3.tar.gz ++++++
++++ 35583 lines of diff (skipped)
++++++ mathgl-doc-path.patch ++++++
--- mathgl-2.0.3.orig/CMakeLists.txt 2012-07-27 11:27:38.000000000 +0400
+++ mathgl-2.0.3/CMakeLists.txt 2012-10-17 22:47:45.903307259 +0400
@@ -344,7 +344,7 @@
if(NOT WIN32)
set(MGL_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/mathgl")
-set(MGL_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/mathgl")
+set(MGL_DOC_PATH "${CMAKE_INSTALL_PREFIX}/share/doc/packages/mathgl")
set(MGL_MAN_PATH "${CMAKE_INSTALL_PREFIX}/share/man")
set(MGL_INFO_PATH "${CMAKE_INSTALL_PREFIX}/share/info")
set(MGL_FONT_PATH "${MGL_DATA_PATH}/fonts")
++++++ mathgl-examples-install.patch ++++++
diff -Pdpru mathgl-2.0.3.orig/examples/CMakeLists.txt
mathgl-2.0.3/examples/CMakeLists.txt
--- mathgl-2.0.3.orig/examples/CMakeLists.txt 2012-07-27 11:27:15.000000000
+0400
+++ mathgl-2.0.3/examples/CMakeLists.txt 2012-08-20 23:08:42.239622224
+0400
@@ -4,37 +4,37 @@ endif(MGL_HAVE_GSL)
add_executable(mgl_example wnd_samples.cpp full_test.cpp)
target_link_libraries(mgl_example mgl)
-# install(
-# TARGETS mgl_example
-# RUNTIME DESTINATION bin
-# )
+install(
+ TARGETS mgl_example
+ RUNTIME DESTINATION bin
+)
if(MGL_HAVE_FLTK)
add_executable(mgl_fltk_example wnd_samples.cpp fltk_example.cpp)
target_link_libraries(mgl_fltk_example mgl-wnd)
-# install(
-# TARGETS mgl_fltk_example
-# RUNTIME DESTINATION bin
-# )
+ install(
+ TARGETS mgl_fltk_example
+ RUNTIME DESTINATION bin
+ )
endif(MGL_HAVE_FLTK)
if(MGL_HAVE_GLUT)
add_executable(mgl_glut_example wnd_samples.cpp glut_example.cpp)
target_link_libraries(mgl_glut_example mgl-glut)
-# install(
-# TARGETS mgl_glut_example
-# RUNTIME DESTINATION bin
-# )
+ install(
+ TARGETS mgl_glut_example
+ RUNTIME DESTINATION bin
+ )
endif(MGL_HAVE_GLUT)
if(MGL_HAVE_WX)
include(${wxWidgets_USE_FILE})
add_executable(mgl_wx_example wnd_samples.cpp wx_example.cpp)
target_link_libraries(mgl_wx_example ${wxWidgets_LIBRARIES} mgl-wnd)
-# install(
-# TARGETS mgl_wx_example
-# RUNTIME DESTINATION bin
-# )
+ install(
+ TARGETS mgl_wx_example
+ RUNTIME DESTINATION bin
+ )
endif(MGL_HAVE_WX)
if(MGL_HAVE_QT)
@@ -42,8 +42,8 @@ if(MGL_HAVE_QT)
qt_wrap_cpp(mgl_qt_example MGL_MOC_EX_FILES ../include/mgl2/qt.h)
add_executable(mgl_qt_example wnd_samples.cpp qt_example.cpp
${MGL_MOC_EX_FILES})
target_link_libraries(mgl_qt_example mgl-wnd ${QT_LIBRARIES})
-# install(
-# TARGETS mgl_qt_example
-# RUNTIME DESTINATION bin
-# )
+ install(
+ TARGETS mgl_qt_example
+ RUNTIME DESTINATION bin
+ )
endif(MGL_HAVE_QT)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
