rpms/Mayavi/devel .cvsignore, 1.2, 1.3 Mayavi.spec, 1.2, 1.3 import.log, 1.1, 1.2 sources, 1.2, 1.3 Mayavi-3.1.0-enthought_tvtk_code_gen_py.patch, 1.1, NONE

Rakesh Pandit rakesh at fedoraproject.org
Sun Jan 31 07:58:03 UTC 2010


Author: rakesh

Update of /cvs/pkgs/rpms/Mayavi/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2108/devel

Modified Files:
	.cvsignore Mayavi.spec import.log sources 
Removed Files:
	Mayavi-3.1.0-enthought_tvtk_code_gen_py.patch 
Log Message:
Updated to 3.3.0



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Mayavi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Jul 2009 06:32:02 -0000	1.2
+++ .cvsignore	31 Jan 2010 07:58:02 -0000	1.3
@@ -1 +1 @@
-Mayavi-3.2.0.tar.gz
+Mayavi-3.3.0.tar.gz


Index: Mayavi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Mayavi/devel/Mayavi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Mayavi.spec	24 Jul 2009 15:37:50 -0000	1.2
+++ Mayavi.spec	31 Jan 2010 07:58:03 -0000	1.3
@@ -2,8 +2,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           Mayavi
-Version:        3.2.0
-Release:        7%{?dist}
+Version:        3.3.0
+Release:        1%{?dist}
 Summary:        Scientific data 3-dimensional visualizer
 
 Group:          Applications/Engineering
@@ -12,9 +12,6 @@ URL:            http://pypi.python.org/p
 Source0:        http://www.enthought.com/repo/ETS/%{name}-%{version}.tar.gz
 Source1:        Mayavi.desktop
 Source2:        tvtk_doc.desktop
-# Removes already generated tvtk class zip file
-# https://svn.enthought.com/enthought/ticket/1817
-Patch0:         Mayavi-3.1.0-enthought_tvtk_code_gen_py.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-setuptools, python-setupdocs, python-sphinx
 BuildRequires:  vtk-python, desktop-file-utils
@@ -50,7 +47,6 @@ module.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b  enthought_tvtk_code_gen_py
 rm -rf Mayavi.egg-info
 
 # removes .buildinfo files
@@ -63,13 +59,6 @@ touch -c -r image_LICENSE.txt image_LICE
 mv -f image_LICENSE.txt.fixed image_LICENSE.txt
 
 # wrong-file-end-of-line-encoding
-sed 's/\r//' examples/mayavi/wx_mayavi_embed_in_notebook.py > \
- examples/mayavi/wx_mayavi_embed_in_notebook.py.fixed
-touch -c -r examples/mayavi/wx_mayavi_embed_in_notebook.py \
- examples/mayavi/wx_mayavi_embed_in_notebook.py.fixed
-mv -f examples/mayavi/wx_mayavi_embed_in_notebook.py.fixed \
- examples/mayavi/wx_mayavi_embed_in_notebook.py
-
 sed 's/\r//' examples/mayavi/data/room_vis.wrl > \
  examples/mayavi/data/room_vis.wrl.fixed
 touch -c -r examples/mayavi/data/room_vis.wrl \
@@ -108,11 +97,8 @@ iconv -f iso8859-1 -t utf-8 docs/THANKS.
  && mv -f docs/THANKS.txt.conv docs/THANKS.txt
 
 # spurious-executable-perm
-chmod -x examples/mayavi/mayavi_traits_ui.py examples/mayavi/test.py \
- examples/mayavi/nongui.py examples/mayavi/numeric_source.py \
- examples/mayavi/glyph.py examples/tvtk/plugins/test.py \
- examples/mayavi/compute_in_thread.py examples/mayavi/contour.py \
- examples/mayavi/streamline.py examples/mayavi/offscreen.py \
+chmod -x examples/mayavi/nongui.py \
+ examples/tvtk/plugins/test.py \
  enthought/mayavi/tests/data/cellsnd.ascii.inp
 
 %build
@@ -121,7 +107,7 @@ CFLAGS="$RPM_OPT_FLAGS" python setup.py 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-python setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+python setup.py install -v -O1 --skip-build --root $RPM_BUILD_ROOT
 sed -i 's/\.dev$//g' $RPM_BUILD_ROOT/%{python_sitearch}/%{name}-%{version}-*.egg-info/requires.txt
 
 # non-executable-script
@@ -164,8 +150,8 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 %files
 %defattr(-,root,root,-)
-%doc *.txt docs/*.txt examples/ docs/pdf/*.pdf
-%doc docs/pdf/*/*.pdf docs/source
+%doc *.txt docs/*.txt examples/
+%doc docs/source
 %{_bindir}/mayavi2
 %{_bindir}/tvtk_doc
 %{python_sitearch}/enthought/*
@@ -178,6 +164,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Jan 31 2010 Rakesh Pandit <rakesh at fedoraproject.org> 3.3.0-1
+- Updated to 3.2.0
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/Mayavi/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	1 Jul 2009 06:32:03 -0000	1.1
+++ import.log	31 Jan 2010 07:58:03 -0000	1.2
@@ -1 +1,2 @@
 Mayavi-3_2_0-6_fc11:HEAD:Mayavi-3.2.0-6.fc11.src.rpm:1246430057
+Mayavi-3_3_0-1_fc12:HEAD:Mayavi-3.3.0-1.fc12.src.rpm:1264924038


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Mayavi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Jul 2009 06:32:03 -0000	1.2
+++ sources	31 Jan 2010 07:58:03 -0000	1.3
@@ -1 +1 @@
-efd2de257e517de54f7697526de9a04c  Mayavi-3.2.0.tar.gz
+efb0ff702142e119cfbd8c2c6d743cfa  Mayavi-3.3.0.tar.gz


--- Mayavi-3.1.0-enthought_tvtk_code_gen_py.patch DELETED ---



More information about the scm-commits mailing list