Update to 1.10
This commit is contained in:
parent
277f964cb2
commit
958683a3bb
|
@ -1,7 +1,7 @@
|
||||||
Index: mathgl/texinfo/mathgl.texi
|
Index: mathgl/texinfo/mathgl.texi
|
||||||
===================================================================
|
===================================================================
|
||||||
--- texinfo/mathgl.texi 2009-03-04 13:22:15.000000000 +0000
|
--- texinfo/mathgl_en.texi 2009-03-04 13:22:15.000000000 +0000
|
||||||
+++ texinfo/mathgl.texi 2009-05-27 17:39:59.000000000 +0100
|
+++ texinfo/mathgl_en.texi 2009-05-27 17:39:59.000000000 +0100
|
||||||
@@ -25,10 +25,10 @@
|
@@ -25,10 +25,10 @@
|
||||||
@end quotation
|
@end quotation
|
||||||
@end copying
|
@end copying
|
||||||
|
|
|
@ -1,24 +1,5 @@
|
||||||
--- widgets/Makefile.am.orig 2009-08-15 12:35:36.000000000 +1000
|
--- examples/Makefile.am 2010-01-02 10:56:23.000000000 +1100
|
||||||
+++ widgets/Makefile.am 2009-08-15 12:35:27.000000000 +1000
|
+++ examples/Makefile.am.new 2010-01-02 10:57:38.000000000 +1100
|
||||||
@@ -18,11 +18,11 @@
|
|
||||||
endif
|
|
||||||
|
|
||||||
if USE_WX
|
|
||||||
-lib_LTLIBRARIES += libmgl-wx.la
|
|
||||||
-libmgl_wx_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
|
|
||||||
-libmgl_wx_la_LIBADD = $(WX_LIBS) $(top_builddir)/mgl/libmgl.la
|
|
||||||
-libmgl_wx_la_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
|
|
||||||
-libmgl_wx_la_SOURCES = mgl_wx.cpp
|
|
||||||
+#lib_LTLIBRARIES += libmgl-wx.la
|
|
||||||
+#libmgl_wx_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
|
|
||||||
+#libmgl_wx_la_LIBADD = $(WX_LIBS) $(top_builddir)/mgl/libmgl.la
|
|
||||||
+#libmgl_wx_la_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
|
|
||||||
+#libmgl_wx_la_SOURCES = mgl_wx.cpp
|
|
||||||
endif
|
|
||||||
|
|
||||||
if USE_QT
|
|
||||||
--- examples/Makefile.am.orig 2009-08-15 12:55:36.000000000 +1000
|
|
||||||
+++ examples/Makefile.am 2009-08-15 12:55:29.000000000 +1000
|
|
||||||
@@ -24,10 +24,10 @@
|
@@ -24,10 +24,10 @@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -26,11 +7,11 @@
|
||||||
-bin_PROGRAMS += mgl_wx_example
|
-bin_PROGRAMS += mgl_wx_example
|
||||||
-mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
|
-mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
|
||||||
-mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
|
-mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
|
||||||
-mgl_wx_example_SOURCES = wx_example.cpp
|
-mgl_wx_example_SOURCES = wnd_samples.cpp wx_example.cpp
|
||||||
+#bin_PROGRAMS += mgl_wx_example
|
+#bin_PROGRAMS += mgl_wx_example
|
||||||
+#mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
|
+#mgl_wx_example_LDADD = $(WX_LIBS) $(top_builddir)/widgets/libmgl-wx.la
|
||||||
+#mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
|
+#mgl_wx_example_CXXFLAGS = $(WX_FLAGS) $(AM_CXXFLAGS)
|
||||||
+#mgl_wx_example_SOURCES = wx_example.cpp
|
+#mgl_wx_example_SOURCES = wnd_samples.cpp wx_example.cpp
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if USE_QT
|
if USE_QT
|
||||||
|
|
37
mathgl.spec
37
mathgl.spec
|
@ -1,7 +1,7 @@
|
||||||
%{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
|
%{!?octave_api:%global octave_api %(octave-config -p API_VERSION || echo 0)}
|
||||||
Name: mathgl
|
Name: mathgl
|
||||||
Version: 1.9
|
Version: 1.10
|
||||||
Release: 7%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Cross-platform library for making high-quality scientific graphics
|
Summary: Cross-platform library for making high-quality scientific graphics
|
||||||
Summary(ru): MathGL - это библиотека для осуществления высококачественной визуализации данных
|
Summary(ru): MathGL - это библиотека для осуществления высококачественной визуализации данных
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
|
@ -9,14 +9,10 @@ Group: Development/Libraries
|
||||||
Url: http://mathgl.sourceforge.net
|
Url: http://mathgl.sourceforge.net
|
||||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
|
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
|
||||||
|
|
||||||
#Fix missing default parameter in hdf5 code
|
|
||||||
Patch0: %{name}-io.patch
|
|
||||||
#Patch to fix parallel build issue (from debian pts)
|
|
||||||
Patch1: %{name}-png.patch
|
|
||||||
#Uncomment mathgl dif listing (fix warning) also from pts
|
#Uncomment mathgl dif listing (fix warning) also from pts
|
||||||
Patch2: %{name}-info.patch
|
Patch0: %{name}-info.patch
|
||||||
#Remove empty libmgl-wx from compilation
|
#Remove empty libmgl-wx from compilation
|
||||||
Patch3: %{name}-no-mglwx.patch
|
Patch1: %{name}-no-mglwx.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
@ -82,8 +78,6 @@ done
|
||||||
|
|
||||||
%patch0
|
%patch0
|
||||||
%patch1
|
%patch1
|
||||||
%patch2
|
|
||||||
%patch3
|
|
||||||
|
|
||||||
autoreconf
|
autoreconf
|
||||||
|
|
||||||
|
@ -124,18 +118,18 @@ tar -zxf $RPM_BUILD_ROOT/%{_datadir}/%{name}/octave/%{name}.tar.gz
|
||||||
rm $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
|
#Copy the .oct file and supporting files to octave packages dir
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
|
mkdir -p $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.10.0/
|
||||||
#Remove empty INDEX file
|
#Remove empty INDEX file
|
||||||
rm %{name}/INDEX
|
rm %{name}/INDEX
|
||||||
|
|
||||||
#We cannot use version macro with octave package search,
|
#We cannot use version macro with octave package search,
|
||||||
# as pkg.m assumes a x.y.z format for packages. Failing
|
# as pkg.m assumes a x.y.z format for packages. Failing
|
||||||
# to do this renders the plugin inoperable
|
# to do this renders the plugin inoperable
|
||||||
cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
|
cp -pR %{name}/inst/* $RPM_BUILD_ROOT/%{_prefix}/libexec/octave/packages/%{name}-1.10.0/
|
||||||
|
|
||||||
#packinfo dir is required, or octave will not find the dir in recursive search
|
#packinfo dir is required, or octave will not find the dir in recursive search
|
||||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo
|
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.10.0/packinfo
|
||||||
cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.9.0/packinfo
|
cp -p %{name}/[A-Z]* $RPM_BUILD_ROOT/%{_datadir}/octave/packages/%{name}-1.10.0/packinfo
|
||||||
|
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
@ -145,7 +139,7 @@ pushd .
|
||||||
#Lets build a "docs" dir to maintain the dir relationships needed for html files
|
#Lets build a "docs" dir to maintain the dir relationships needed for html files
|
||||||
mkdir -p texinfo/docs
|
mkdir -p texinfo/docs
|
||||||
cd texinfo/docs/
|
cd texinfo/docs/
|
||||||
cp -pr ../mathgl.html .
|
cp -pr ../mathgl_en.html .
|
||||||
cp -pr ../png_static .
|
cp -pr ../png_static .
|
||||||
cp -pr ../png/ .
|
cp -pr ../png/ .
|
||||||
|
|
||||||
|
@ -184,9 +178,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
%{_libdir}/*.so.*
|
%{_libdir}/*.so.*
|
||||||
%{_bindir}/mgl*
|
%{_bindir}/mgl*
|
||||||
%{_datadir}/%{name}/
|
%{_datadir}/%{name}/
|
||||||
%{_prefix}/libexec/octave/packages/%{name}-1.9.0/
|
%{_prefix}/libexec/octave/packages/%{name}-1.10.0/
|
||||||
%{_datadir}/octave/packages/%{name}-1.9.0/
|
%{_datadir}/octave/packages/%{name}-1.10.0/
|
||||||
%{_infodir}/%{name}.*.gz
|
%{_infodir}/%{name}_en.*.gz
|
||||||
|
%{_infodir}/%{name}_ru.*.gz
|
||||||
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
|
@ -199,6 +194,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||||
%doc texinfo/docs/*
|
%doc texinfo/docs/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Jan 02 2010 <mycae(a!t)yahoo.com> - 1.10-1
|
||||||
|
- Update to 1.10
|
||||||
|
|
||||||
|
* Wed Nov 25 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.9-8
|
||||||
|
- Rebuild for Qt 4.6.0 RC1 in F13 (was built against Beta 1 with unstable ABI)
|
||||||
|
|
||||||
* Sun Oct 25 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 1.9-7
|
* Sun Oct 25 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 1.9-7
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue