[mathgl/f13] * Update to 1.11.2
mycae
mycae at fedoraproject.org
Thu Jun 2 19:49:02 UTC 2011
commit e0eac6f8b52151db1f7e363a1a7b4cb65f40d867
Author: mycae <mycae(atime)yahoo.com>
Date: Thu Jun 2 20:48:27 2011 +0100
* Update to 1.11.2
mathgl-1.11.2-fltk.patch | 12 +++++++
mathgl.spec | 81 ++++++++++++++++++----------------------------
sources | 2 +-
3 files changed, 45 insertions(+), 50 deletions(-)
---
diff --git a/mathgl-1.11.2-fltk.patch b/mathgl-1.11.2-fltk.patch
new file mode 100644
index 0000000..4b22336
--- /dev/null
+++ b/mathgl-1.11.2-fltk.patch
@@ -0,0 +1,12 @@
+diff -Naur mathgl-1.11.0.1.orig/include/mgl/mgl_fltk.h mathgl-1.11.0.1/include/mgl/mgl_fltk.h
+--- mathgl-1.11.0.1.orig/include/mgl/mgl_fltk.h 2010-11-13 22:04:11.000000000 +0100
++++ mathgl-1.11.0.1/include/mgl/mgl_fltk.h 2011-05-31 12:51:46.477338346 +0200
+@@ -29,7 +29,7 @@
+ #endif
+
+ #include <FL/Fl.H>
+-#include <Fl/Fl_Scroll.H>
++#include <FL/Fl_Scroll.H>
+ #include <FL/Fl_Button.H>
+ #include <FL/Fl_Counter.H>
+ #include <FL/Fl_Menu_Bar.H>
diff --git a/mathgl.spec b/mathgl.spec
index 8508064..07df654 100644
--- a/mathgl.spec
+++ b/mathgl.spec
@@ -1,18 +1,18 @@
-%{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
Name: mathgl
-Version: 1.11.0.1
+Version: 1.11.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): MathGL - это библиотека для осуществления высококачественной визуализации данных
License: GPLv2+
Group: Development/Libraries
Url: http://mathgl.sourceforge.net
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
#Uncomment mathgl dif listing (fix warning) also from pts
Patch0: %{name}-info.patch
-#Datatype conversion (int->int32) on x86 in hdf4 read func
-Patch1: %{name}-hdf4-datatype.patch
+#Fltk uses /usr/include/FL
+Patch1: %{name}-%{version}-fltk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -22,7 +22,7 @@ BuildRequires: swig
# optional packages
BuildRequires: freeglut-devel hdf-devel hdf5-devel libjpeg-devel libtiff-devel fltk-devel qt4-devel
-BuildRequires: wxGTK-devel giflib-devel octave-devel
+BuildRequires: wxGTK-devel giflib-devel
#For autoreconf (required for patches, libtool)
BuildRequires: autoconf
@@ -32,8 +32,6 @@ BuildRequires: libtool
Requires(post): info
Requires(preun): info
-Requires: octave(api) = %{octave_api}
-
%description
Mathgl is a cross-platform library for making high-quality scientific
graphics. It provides fast data plotting and handling of large data
@@ -79,7 +77,7 @@ for file in AUTHORS ChangeLog.txt README COPYRIGHT; do
done
%patch0
-%patch1
+%patch1 -p1
@@ -92,7 +90,7 @@ 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
+ --enable-all
#Force strip rpath
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -109,41 +107,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
#Trash the .la files that get generated anyway (faulty configure? Doesn't appear up without --disable-ltdtl-install)
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-
-#Fix up octave .oct file install
-mkdir -p temp-octave
-
-pushd .
-cd temp-octave
-#Decompress tarballed "oct" file and remove tarball
-tar -zxf $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
-rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
-
-#Copy the .oct file and supporting files to octave packages dir
-mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.10.1/
-#Remove empty INDEX file
-rm %{name}/INDEX
-
-#Fix PKG_ADD
-echo "pkg load mathgl" > %{name}/PKG_ADD
-echo "mathgl;" >> %{name}/PKG_ADD
-
-#fix wrong version number in 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.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.11.0/packinfo
-cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.11.0/packinfo
-
-popd
-
-
-
pushd .
#Lets build a "docs" dir to maintain the dir relationships needed for html files
mkdir -p texinfo/docs
@@ -177,7 +140,6 @@ popd
%post
/sbin/ldconfig
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
-octave -q -H --no-site-file --eval "pkg('rebuild');"
%preun
if [ $1 = 0 ] ; then
@@ -186,7 +148,6 @@ fi
%postun
/sbin/ldconfig
-octave -q -H --no-site-file --eval "pkg('rebuild');"
%clean
rm -rf $RPM_BUILD_ROOT
@@ -198,8 +159,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so.*
%{_bindir}/mgl*
%{_datadir}/%{name}/
-%{_prefix}/libexec/octave/packages/%{name}-1.11.0/
-%{_datadir}/octave/packages/%{name}-1.11.0/
%{_infodir}/%{name}.*.gz
%{_infodir}/%{name}_ru.*.gz
@@ -214,6 +173,30 @@ rm -rf $RPM_BUILD_ROOT
%doc texinfo/docs/*
%changelog
+* Wed Jun 01 2011 <mycae(a!t)yahoo.com> - 1.11.2-1
+- Update to upstream 1.11.2
+
+* Tue May 31 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.11.0.1-6
+- Reflect fltk having changed its include directory (Fix FTBS).
+- Fix German %%summary.
+
+* Tue May 31 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 1.11.0.1-6
+- Reflect fltk having changed its include directory (Fix FTBS).
+- Fix German %%summary.
+
+* Tue May 17 2011 Orion Poplawski <orion at cora.nwra.com> - 1.11.0.1-5
+- Rebuild for hdf5 1.8.7
+
+* Sun Feb 27 2011 <mycae(a!t)yahoo.com> - 1.11.0.1-4
+- Remove octave for Bug 679948, and dynamic patch non-functional due
+ to swig covariant return type problems with octave_map
+
+* Sat Feb 12 2011 <mycae(a!t)yahoo.com> - 1.11.0.1-3
+- Request rebuild -- octave-config needs to emit correct api.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.0.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
* Sat Nov 27 2010 <mycae(a!t)yahoo.com> - 1.11.0.1-1
- Update to 1.11.0.1
diff --git a/sources b/sources
index eb63a7f..df50a3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4122428797fd0c25a096c377b9ffe44a mathgl-1.10.2.1.tgz
+acd33e68911d9506f60d769dce23f95e mathgl-1.11.2.tar.gz
More information about the scm-commits
mailing list