Hello community,
here is the log from the commit of package mathgl for openSUSE:Factory checked
in at 2013-05-03 13:43:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mathgl (Old)
and /work/SRC/openSUSE:Factory/.mathgl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mathgl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/mathgl/mathgl.changes 2013-03-08
09:22:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.mathgl.new/mathgl.changes 2013-05-03
13:43:29.000000000 +0200
@@ -1,0 +2,10 @@
+Thu May 2 15:19:52 UTC 2013 - dmitr...@opensuse.org
+
+- Update to version 2.1.3
+ * bugfix release, see included ChangeLog.txt for details
+- Split libraries into separate packages
+- Split mathgl CGI into separate package
+- Spec file reformatting
+- Removed obsolete mathgl-libpath.patch
+
+-------------------------------------------------------------------
Old:
----
mathgl-2.1.2.tar.gz
mathgl-libpath.patch
New:
----
mathgl-2.1.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mathgl.spec ++++++
--- /var/tmp/diff_new_pack.08SV7C/_old 2013-05-03 13:43:30.000000000 +0200
+++ /var/tmp/diff_new_pack.08SV7C/_new 2013-05-03 13:43:30.000000000 +0200
@@ -18,21 +18,21 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib())")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from
distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%define octave_args --no-window-system --norc
Name: mathgl
-%define libname lib%{name}
-Version: 2.1.2
+%define libname libmgl
+Version: 2.1.3
Release: 0
%define somajor 7
+%define libversion %{somajor}_0_0
Summary: Cross-platform library for making high-quality scientific
graphics
License: GPL-3.0
Group: Productivity/Scientific/Other
Url: http://mathgl.sourceforge.net
Source:
http://downloads.sourceforge.net/mathgl/%{name}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM mathgl-fltk.patch -- Correct typo in fltk's include
statements
-Patch0: mathgl-fltk.patch
-# PATCH-FIX-UPSTREAM mathgl-libpath.patch -- Allow setting installed libraries
location using a cmake variable
-Patch1: mathgl-libpath.patch
+Patch1: mathgl-fltk.patch
# PATCH-FIX-UPSTREAM mathgl-fix-python-module-path.patch -- Make python
modules install arch-depended
Patch2: mathgl-fix-python-module-path.patch
# PATCH-FEATURE-UPSTREAM mathgl-examples-install.patch -- Enable examples
install
@@ -48,10 +48,11 @@
BuildRequires: giflib-devel
BuildRequires: gsl-devel
BuildRequires: hdf5-devel
+BuildRequires: libQtWebKit-devel
+BuildRequires: libharu-devel
BuildRequires: libjpeg-devel
-# BuildRequires: libharu-devel
BuildRequires: libpng-devel
-BuildRequires: libqt4-devel
+BuildRequires: libqt4-devel >= 4.8
BuildRequires: libtiff-devel
BuildRequires: libtool
BuildRequires: octave-devel
@@ -82,22 +83,90 @@
into other programs. Mathgl integrates into fltk, qt and
opengl applications.
-%package -n %{libname}%{somajor}
-Summary: Cross-platform library for making high-quality scientific
graphics
+%package -n %{libname}%{libversion}
+Summary: Mathgl is a cross-platform library for making high-quality
scientific graphics
Group: System/Libraries
+Obsoletes: libmathgl7 <= 2.1.2
Requires: %{name}-fonts
-%description -n %{libname}%{somajor}
+%description -n %{libname}%{libversion}
+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.
+
+%package -n %{libname}-fltk%{libversion}
+Summary: Mathgl FLTK widget library for making high-quality scientific
graphics
+Group: System/Libraries
+
+%description -n %{libname}-fltk%{libversion}
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.
+%package -n %{libname}-glut%{libversion}
+Summary: Mathgl window library for making high-quality scientific
graphics
+Group: System/Libraries
+
+%description -n %{libname}-glut%{libversion}
+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.
+
+%package -n %{libname}-qt%{libversion}
+Summary: Mathgl Qt4 widget library for making high-quality scientific
graphics
+Group: System/Libraries
+
+%description -n %{libname}-qt%{libversion}
+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.
+
+%package -n %{libname}-wnd%{libversion}
+Summary: Mathgl window library for making high-quality scientific
graphics
+Group: System/Libraries
+
+%description -n %{libname}-wnd%{libversion}
+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.
+
+%package -n %{libname}-wx%{libversion}
+Summary: Mathgl wxWidget library for making high-quality scientific
graphics
+Group: System/Libraries
+
+%description -n %{libname}-wx%{libversion}
+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.
+
+%package cgi
+Summary: Mathgl CGI binary
+Group: Productivity/Scientific/Other
+
+%description cgi
+This package contains mathgl binary for parsing CGI scripts.
+
%package devel
Summary: Libraries and header files for %{name} library
Group: Development/Libraries/Other
-Requires: %{libname}%{somajor} = %{version}
+Requires: %{libname}%{libversion} = %{version}
+Requires: %{libname}-fltk%{libversion} = %{version}
+Requires: %{libname}-glut%{libversion} = %{version}
+Requires: %{libname}-qt%{libversion} = %{version}
+Requires: %{libname}-wnd%{libversion} = %{version}
+Requires: %{libname}-wx%{libversion} = %{version}
%if 0%{?suse_version}
Recommends: %{name}-doc
%endif
@@ -112,26 +181,38 @@
This package contains libraries and header files for developing
applications that use mathgl.
-%package tools
-Summary: Command line tools for %{name} library
-Group: Productivity/Scientific/Other
-Requires: %{libname}%{somajor} = %{version}
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation/Other
+BuildArch: noarch
-%description tools
-This package contains command line tools for making high-quality scientific
graphics.
+%description doc
+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.
-%package fonts
-Summary: Fonts for %{name} library
-Group: System/X11/Fonts
+This package provides the documentation for mathgl.
+
+%package doc-ru
+Summary: Russian documentation for %{name}
+Group: Documentation/Other
+Requires: mathgl-doc
BuildArch: noarch
-%description fonts
-This package contains command fonts for mathgl library.
+%description doc-ru
+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 Russian documentation for mathgl.
%package examples
Summary: Examples for %{name} library
Group: Productivity/Scientific/Other
-Requires: %{libname}%{somajor} = %{version}
%description examples
Mathgl is a cross-platform library for making high-quality scientific
@@ -142,25 +223,31 @@
This package contains examples of using mathgl.
-%package doc
-Summary: Documentation for %{name}
-Group: Documentation/Other
-Requires: %{libname}%{somajor} = %{version}
+%package fonts
+Summary: Fonts for %{name} library
+Group: System/X11/Fonts
BuildArch: noarch
-%description doc
+%description fonts
+This package contains command fonts for mathgl library.
+
+%package -n octave-mathgl
+Summary: Octave interface for %{name} library
+Group: Productivity/Scientific/Other
+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 the documentation for mathgl.
+This package provides octave interface for mathgl.
%package -n python-mathgl
Summary: Libraries and header files for %{name} library
Group: Productivity/Scientific/Other
-Requires: %{libname}%{somajor} = %{version}
Requires: python-base
%description -n python-mathgl
@@ -172,25 +259,16 @@
This package provides the python bindings for mathgl.
-%package -n octave-mathgl
-Summary: Octave interface for %{name} library
+%package tools
+Summary: Command line tools for %{name} library
Group: Productivity/Scientific/Other
-Requires: %{libname}%{somajor} = %{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.
+%description tools
+This package contains command line tools for making high-quality scientific
graphics.
%package -n udav
Summary: Data handling and plotting tool
Group: Productivity/Scientific/Other
-Requires: %{libname}%{somajor} = %{version}
%description -n udav
UDAV is cross-platform program for data arrays visualization based
@@ -199,10 +277,8 @@
window interface for data viewing, changing and plotting.Also it
can execute MGL scripts, setup and rotate graphics and so on.
-
%prep
%setup -q
-%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -223,14 +299,15 @@
cmake \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DLIB_INSTALL_DIR:PATH=%{_lib} \
+ -DMGL_LIB_INSTALL_DIR:PATH=%{_lib} \
-Denable-double=on \
-Denable-mpi=off \
- -Denable-pthread=off \
+ -Denable-pthread=on \
-Denable-gsl=on \
-Denable-jpeg=on \
-Denable-png=on \
-Denable-zlib=on \
- -Denable-pdf=off \
+ -Denable-pdf=on \
-Denable-gif=on \
-Denable-hdf5=on \
-Denable-opengl=on \
@@ -253,7 +330,7 @@
# Install octave-mathgl
mkdir -p %{buildroot}%{_libdir}/octave/packages
mkdir -p %{buildroot}%{_datadir}/octave/packages
-octave --norc --eval "pkg prefix %{buildroot}%{_datadir}/octave/packages
%{buildroot}%{_libdir}/octave/packages; pkg install lang/%{name}.tar.gz"
+octave %{octave_args} --eval "pkg prefix
%{buildroot}%{_datadir}/octave/packages %{buildroot}%{_libdir}/octave/packages;
pkg install lang/%{name}.tar.gz"
rm %{buildroot}%{_datadir}/octave/packages/*/packinfo/.autoload
# remove octave module archive
rm %{buildroot}%{_datadir}/%{name}/%{name}.tar.gz
@@ -263,6 +340,13 @@
# Install docs
install -m 644 {AUTHORS,ChangeLog.txt,README,COPYING}
%{buildroot}%{_docdir}/%{name}/
+install -m 644 texinfo/{classes.pdf,mgl_en.pdf} %{buildroot}%{_docdir}/%{name}/
+install -d %{buildroot}%{_docdir}/%{name}/mathgl_ru
+install -m 644 texinfo/mathgl_ru/* %{buildroot}%{_docdir}/%{name}/mathgl_ru/
+
+# move mgl.cgi
+install -d %{buildroot}/srv/www/cgi-bin/
+mv %{buildroot}%{_datadir}/%{name}/mgl.cgi %{buildroot}/srv/www/cgi-bin/mgl.cgi
%post doc
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}_en.info.gz
@@ -274,54 +358,114 @@
%install_info_delete --info-dir=%_infodir %{_infodir}/%{name}_en.info-1.gz
%install_info_delete --info-dir=%_infodir %{_infodir}/%{name}_en.info-2.gz
-%post -n %{libname}%{somajor} -p /sbin/ldconfig
+%post -n %{libname}%{libversion} -p /sbin/ldconfig
+
+%postun -n %{libname}%{libversion} -p /sbin/ldconfig
+
+%post -n %{libname}-fltk%{libversion} -p /sbin/ldconfig
-%postun -n %{libname}%{somajor} -p /sbin/ldconfig
+%postun -n %{libname}-fltk%{libversion} -p /sbin/ldconfig
+
+%post -n %{libname}-glut%{libversion} -p /sbin/ldconfig
+
+%postun -n %{libname}-glut%{libversion} -p /sbin/ldconfig
+
+%post -n %{libname}-qt%{libversion} -p /sbin/ldconfig
+
+%postun -n %{libname}-qt%{libversion} -p /sbin/ldconfig
+
+%post -n %{libname}-wnd%{libversion} -p /sbin/ldconfig
+
+%postun -n %{libname}-wnd%{libversion} -p /sbin/ldconfig
+
+%post -n %{libname}-wx%{libversion} -p /sbin/ldconfig
+
+%postun -n %{libname}-wx%{libversion} -p /sbin/ldconfig
%post -n octave-mathgl
-octave -qf --eval "pkg rebuild -auto mathgl"
+octave -qf %{octave_args} --eval "pkg rebuild -auto mathgl"
%postun -n octave-mathgl
-octave -qf --eval "pkg rebuild"
+octave -qf %{octave_args} --eval "pkg rebuild"
-%files -n %{libname}%{somajor}
+%files -n %{libname}%{libversion}
%defattr(-,root,root)
-%{_libdir}/*.so.%{somajor}*
+%{_libdir}/libmgl.so.%{somajor}*
-%files fonts
+%files -n %{libname}-fltk%{libversion}
+%defattr(-,root,root)
+%{_libdir}/libmgl-fltk.so.%{somajor}*
+
+%files -n %{libname}-glut%{libversion}
+%defattr(-,root,root)
+%{_libdir}/libmgl-glut.so.%{somajor}*
+
+%files -n %{libname}-qt%{libversion}
+%defattr(-,root,root)
+%{_libdir}/libmgl-qt.so.%{somajor}*
+
+%files -n %{libname}-wnd%{libversion}
+%defattr(-,root,root)
+%{_libdir}/libmgl-wnd.so.%{somajor}*
+
+%files -n %{libname}-wx%{libversion}
+%defattr(-,root,root)
+%{_libdir}/libmgl-wx.so.%{somajor}*
+
+%files cgi
%defattr(-,root,root)
-%{_datadir}/%{name}/
+/srv/www/cgi-bin/mgl.cgi
+%{_mandir}/man1/mgl.cgi.1.gz
%files devel
%defattr(-,root,root)
%{_includedir}/mgl2/
%{_libdir}/*.so
-%files tools
-%defattr(-,root,root)
-%{_bindir}/mglconv
-%{_bindir}/mglview
-%{_bindir}/mgl.cgi
-%{_mandir}/man1/*.gz
-%{_mandir}/man5/*.gz
-
%files doc
%defattr(-,root,root)
-%doc %{_defaultdocdir}/mathgl/
+%dir %{_defaultdocdir}/mathgl
+%doc %{_defaultdocdir}/mathgl/mathgl_en/
+%doc %{_defaultdocdir}/mathgl/png/
+%doc %{_defaultdocdir}/mathgl/udav/
+%doc %{_defaultdocdir}/mathgl/*.html
+%doc %{_defaultdocdir}/mathgl/*.pdf
+%doc %{_defaultdocdir}/mathgl/*.png
+%doc %{_defaultdocdir}/mathgl/AUTHORS
+%doc %{_defaultdocdir}/mathgl/ChangeLog.txt
+%doc %{_defaultdocdir}/mathgl/README
+%doc %{_defaultdocdir}/mathgl/COPYING
%{_infodir}/%{name}_en.info*.gz
+%files doc-ru
+%defattr(-,root,root)
+%doc %{_defaultdocdir}/mathgl/mathgl_ru/
+
%files examples
%defattr(-,root,root)
%{_bindir}/mgl*example
+%files fonts
+%defattr(-,root,root)
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/fonts/
+
+%files -n octave-mathgl
+%defattr(-,root,root)
+%{_datadir}/octave/packages/%{name}-%{version}/
+%{_libdir}/octave/packages/%{name}-%{version}/
+
%files -n python-mathgl
%defattr(-,root,root)
%{python_sitearch}/*
-%files -n octave-mathgl
+%files tools
%defattr(-,root,root)
-%{_datadir}/octave/packages/%{name}-*/
-%{_libdir}/octave/packages/%{name}-*/
+%{_bindir}/mglconv
+%{_bindir}/mglview
+%{_mandir}/man1/mglconv.1.gz
+%{_mandir}/man1/mglview.1.gz
+%{_mandir}/man5/mgl.5.gz
%files -n udav
%defattr(-,root,root)
@@ -329,5 +473,6 @@
%{_datadir}/pixmaps/udav.png
%{_datadir}/applications/udav.desktop
%{_datadir}/udav/
+%{_mandir}/man1/udav.1.gz
%changelog
++++++ mathgl-2.1.2.tar.gz -> mathgl-2.1.3.tar.gz ++++++
++++ 13160 lines of diff (skipped)
++++++ mathgl-doc-path.patch ++++++
--- /var/tmp/diff_new_pack.08SV7C/_old 2013-05-03 13:43:31.000000000 +0200
+++ /var/tmp/diff_new_pack.08SV7C/_new 2013-05-03 13:43:31.000000000 +0200
@@ -1,13 +1,13 @@
-Index: mathgl-2.1/CMakeLists.txt
+Index: mathgl-2.1.3/CMakeLists.txt
===================================================================
---- mathgl-2.1.orig/CMakeLists.txt
-+++ mathgl-2.1/CMakeLists.txt
-@@ -366,7 +366,7 @@ endif(WIN32)
-
+--- mathgl-2.1.3.orig/CMakeLists.txt
++++ mathgl-2.1.3/CMakeLists.txt
+@@ -92,7 +92,7 @@ set(MGL_CGI_PATH "${CMAKE_INSTALL_PREFIX
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")
+ # set(MGL_CGI_PATH "${CMAKE_INSTALL_PREFIX}/share/mathgl")
+ 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 ++++++
--- /var/tmp/diff_new_pack.08SV7C/_old 2013-05-03 13:43:31.000000000 +0200
+++ /var/tmp/diff_new_pack.08SV7C/_new 2013-05-03 13:43:31.000000000 +0200
@@ -1,7 +1,7 @@
-Index: mathgl-2.1.2/examples/CMakeLists.txt
+Index: mathgl-2.1.3/examples/CMakeLists.txt
===================================================================
---- mathgl-2.1.2.orig/examples/CMakeLists.txt
-+++ mathgl-2.1.2/examples/CMakeLists.txt
+--- mathgl-2.1.3.orig/examples/CMakeLists.txt
++++ mathgl-2.1.3/examples/CMakeLists.txt
@@ -4,22 +4,38 @@ endif(MGL_HAVE_GSL)
add_executable(mgl_example wnd_samples.cpp full_test.cpp samples.cpp)
@@ -42,7 +42,7 @@
if(MGL_HAVE_QT)
@@ -27,4 +43,8 @@ if(MGL_HAVE_QT)
- qt_wrap_cpp(mgl_qt_example MGL_MOC_EX_FILES ../include/mgl2/qt.h)
+ # 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-qt)
+ install(
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
