[mathgl] Update te 2.2
Dmitrij S. Kryzhevich
krege at fedoraproject.org
Thu Jan 16 05:05:29 UTC 2014
commit 06ab450749968f16a5957734172467bce783393a
Author: Dmitrij S. Kryzhevich <krege at land.ru>
Date: Thu Jan 16 12:05:16 2014 +0700
Update te 2.2
.gitignore | 1 +
mathgl-2.1.2-examples.patch | 41 --
mathgl-2.1.2-stlerror.patch | 722 --------------------------
mathgl-2.1.2-udav_desktop.patch | 14 -
mathgl-disable-lib-installdir.patch | 12 -
mathgl-fix-overflow.patch | 40 --
mathgl-fltk-skip-fluid.patch | 11 -
mathgl-no-hdf4-and-hdf5-simultaneously.patch | 12 -
mathgl.spec | 84 ++--
sources | 2 +-
10 files changed, 43 insertions(+), 896 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 824e8d5..6c51fa5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ mathgl-1.10.2.1.tgz
/mathgl-1.11.2.tar.gz
/mathgl-1.11.3.tar.gz
/mathgl-2.1.2.tar.gz
+/mathgl-2.2.tar.gz
diff --git a/mathgl.spec b/mathgl.spec
index d512841..b5a6400 100644
--- a/mathgl.spec
+++ b/mathgl.spec
@@ -1,6 +1,6 @@
Name: mathgl
-Version: 2.1.2
-Release: 11%{?dist}
+Version: 2.2
+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): Библиотека для осуществления высококачественной визуализации данных
@@ -10,27 +10,18 @@ Url: http://mathgl.sourceforge.net
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
#Mathgl's enable all tries to use hdf4 and 5 at the same time
-Patch0: mathgl-no-hdf4-and-hdf5-simultaneously.patch
+Patch0: mathgl-2.2-no-hdf4-and-hdf5-simultaneously.patch
#CMake looks for "FLUID" - the fltk UI designer.
#This is not needed - instruct cmake to skip it at build time
-Patch1: mathgl-fltk-skip-fluid.patch
+Patch1: mathgl-2.2-fltk-skip-fluid.patch
#Mathgl hardcodes the libdir as lib, then puts it in a var.
# we will simply pass it as an arg to cmake.
-Patch2: mathgl-disable-lib-installdir.patch
-
-#Fix segfault due to overflow when initalising textures
-Patch3: mathgl-fix-overflow.patch
-
-# Fix udav.desktop: Encoding and Icon keys
-Patch4: mathgl-2.1.2-udav_desktop.patch
+Patch2: mathgl-2.2-disable-lib-installdir.patch
# Install binaries for generation examples of illustrations
-Patch5: mathgl-2.1.2-examples.patch
-
-# Fix for pics generation segfaults (from upstream)
-Patch6: mathgl-2.1.2-stlerror.patch
+Patch3: mathgl-2.2-examples.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -42,10 +33,11 @@ BuildRequires: desktop-file-utils
BuildRequires: cmake
# optional packages
-BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel
-BuildRequires: wxGTK-devel giflib-devel
+BuildRequires: freeglut-devel hdf5-devel libjpeg-devel libtiff-devel
+BuildRequires: fltk-devel qt4-devel qtwebkit-devel
+BuildRequires: wxGTK-devel giflib-devel
BuildRequires: libharu-devel
-BuildRequires: swig octave-devel
+BuildRequires: swig octave-devel lua-devel
BuildRequires: libXmu-devel
BuildRequires: python2-devel numpy
@@ -181,22 +173,21 @@ done
%patch0
%patch1
%patch2
-%patch3
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+%patch3 -p1
# Fix hardcoded paths
+sed -i s,/usr/local/share/doc/mathgl/,%{_docdir}/%{name}/, mgllab/main.cpp
sed -i s,/usr/local/share/doc/mathgl/,%{_docdir}/%{name}/, udav/udav_wnd.h
sed -i s,/usr/local/share/udav/,%{_datadir}/udav/, udav/udav_wnd.cpp
+sed -i s,/usr/local/share/mathgl/fonts/,%{_datadir}/%{name}/fonts/, udav/prop_dlg.cpp
%build
%define building() \
-BUILD_MPI="-Denable-mpi=on -Denable-doc=off" %buildcommon
+BUILD_MPI="-Denable-mpi=on -Denable-all-docs=off" %buildcommon
%define building_serial() \
-BUILD_MPI="-Denable-mpi=off -Denable-doc=on" %buildcommon
+BUILD_MPI="-Denable-mpi=off -Denable-all-docs=on" %buildcommon
%define buildcommon() \
mkdir -p %{_target_platform}_$MPI_COMPILER_NAME; \
@@ -261,8 +252,20 @@ unlink %{buildroot}/%{python_sitelib}/_mathgl.so
#Remove static libraries generated by cmake
rm %{buildroot}/%{_libdir}/*.a
-#Remove the binary mgl.cgi. Im not convinced about it (eg mem leak in main), and that its really needed
-rm %{buildroot}/%{_bindir}/mgl.cgi
+# Remove the binary mgl.cgi. Im not convinced about it (eg mem leak in main), and that its really needed
+# The same with man file for it
+rm %{buildroot}/%{_datadir}/mathgl/mgl.cgi
+rm %{buildroot}/%{_mandir}/man1/mgl.cgi.1*
+
+# Remove bad octave archive
+rm %{buildroot}%{_datadir}/mathgl/mathgl.tar.gz
+
+# Prepare for documentation
+if [ -d _tmp_docdir ]
+then
+rm -r _tmp_docdir
+fi
+mv %{buildroot}%{_docdir}/mathgl _tmp_docdir
# Check .desktop file
desktop-file-validate %{buildroot}%{_datadir}/applications/udav.desktop
@@ -282,22 +285,18 @@ fi
%postun -p /sbin/ldconfig
-%clean
-rm -rf %{buildroot}
-
-
%files
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog.txt README COPYING README_V2
%{_libdir}/*.so.*
+%{_libdir}/mgl-lua.so
%{_bindir}/mgl*
%exclude %{_bindir}/mgl_*example
%{_mandir}/man1/mglconv.1.gz
%{_mandir}/man1/mglview.1.gz
%files devel
-%defattr(-,root,root,-)
%{_libdir}/*.so
+%exclude %{_libdir}/mgl-lua.so
%{_includedir}/mgl2/
%files -n udav -f udav.lang
@@ -308,41 +307,40 @@ rm -rf %{buildroot}
%{_datadir}/pixmaps/*.png
%files doc
-%defattr(-,root,root,-)
-%doc %{_docdir}/%{name}
+%doc AUTHORS COPYING
+%doc _tmp_docdir/*
%files common
-%defattr(-,root,root,-)
%{python_sitelib}/*
%{_datadir}/%{name}/
%{_infodir}/%{name}*.gz
%{_mandir}/man5/mgl.5.gz
%files examples
-%defattr(-,root,root,-)
%{_bindir}/mgl_*example
%files openmpi
-%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/openmpi/lib/*.so.*
%files openmpi-devel
-%defattr(-,root,root,-)
%{_libdir}/openmpi/lib/*.so
%{_includedir}/openmpi-%{_arch}/mgl2/
%files mpich
%doc COPYING
-%defattr(-,root,root,-)
%{_libdir}/mpich/lib/*.so.*
%files mpich-devel
-%defattr(-,root,root,-)
%{_libdir}/mpich/lib/*.so
%{_includedir}/mpich-%{_arch}/mgl2/
%changelog
+* Wed Dec 25 2013 Dmitrij S. Kryzhevich <krege at land.ru> - 2.2-1
+- Update to 2.2.
+- Fix bogus dates.
+- Fix issue with docdirs.
+
* Mon Aug 12 2013 Orion Poplawski <orion at cora.nwra.com> - 2.1.2-11
- Fix hdf BRs
@@ -355,7 +353,7 @@ rm -rf %{buildroot}
* Thu May 16 2013 Orion Poplawski <orion at cora.nwra.com> - 2.1.2-8
- Rebuild for hdf5 1.8.11
-* Thu Apr 23 2013 Dmitrij S. Kryzhevich <krege at land.ru> - 2.1.2-7
+* Tue Apr 23 2013 Dmitrij S. Kryzhevich <krege at land.ru> - 2.1.2-7
- Modify patch to fix pics generation.
* Mon Apr 22 2013 Dmitrij S. Kryzhevich <krege at land.ru> - 2.1.2-6
@@ -497,7 +495,7 @@ rm -rf %{buildroot}
- Perserve timestamps on EOL conversion
- Added patch to disable unused gsl cblas link
-* Fri May 02 2009 <mycae(a!t)yahoo.com> 1.8.1-1
+* Sat May 02 2009 <mycae(a!t)yahoo.com> 1.8.1-1
- Update to 1.8.1
* Wed Jan 28 2009 <mycae(a!t)yahoo.com> 1.8-3
@@ -525,7 +523,7 @@ rm -rf %{buildroot}
* Tue Jun 3 2008 Nik <niktr at mail.ru>
- updated to version 1.7.1
-* Sun Jun 2 2008 Nik <niktr at mail.ru>
+* Mon Jun 2 2008 Nik <niktr at mail.ru>
- updated to version 1.7
* Sat Apr 5 2008 Nik <niktr at mail.ru>
diff --git a/sources b/sources
index 026ae59..9968b9a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-47eea09ab905789ad28a2ded1149e4c7 mathgl-2.1.2.tar.gz
+0e55af7f73590104c7a1d5cbf1a3da84 mathgl-2.2.tar.gz
More information about the scm-commits
mailing list