[Ecell-cvs] SF.net SVN: ecell:[3865] ecell-build/trunk/pkg/rpm

[<mor...@us...>]

Revision: 3865
          http://ecell.svn.sourceforge.net/ecell/?rev=3865&view=rev
Author:   moriyoshi
Date:     2010-09-22 13:43:35 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
* Update.

Modified Paths:
--------------
    ecell-build/trunk/pkg/rpm/ecell-3.2.1-ply-2.3-compat.patch
    ecell-build/trunk/pkg/rpm/ecell3.spec

Modified: ecell-build/trunk/pkg/rpm/ecell-3.2.1-ply-2.3-compat.patch
===================================================================
--- ecell-build/trunk/pkg/rpm/ecell-3.2.1-ply-2.3-compat.patch	2010-09-17 04:54:53 UTC (rev 3864)
+++ ecell-build/trunk/pkg/rpm/ecell-3.2.1-ply-2.3-compat.patch	2010-09-22 13:43:35 UTC (rev 3865)
@@ -8,7 +8,7 @@
 -    lex.lex( lextab=lextabmod[-1], optimize=1, outputdir=os.path.join( outputdir,*lextabmod[:-1] ) )
 -    yacc.yacc( tabmodule=parsertabmod[-1], outputdir=os.path.join( outputdir, *parsertabmod[:-1] ) )
 +    lex.lex( lextab=lextabmod[-1], optimize=1 )
-+    os.rename( lextabmod[-1] + ".py", os.path.join( outputdir, *lextabmod ) )
++    os.rename( lextabmod[-1] + ".py", os.path.join( outputdir, *lextabmod ) + ".py" )
 +    yacc.yacc( tabmodule=parsertabmod[-1], optimize=1, outputdir=os.path.join( outputdir, *parsertabmod[:-1] ) )
  
  def convertEm2Eml( anEmFileObject, debug=0 ):
@@ -23,7 +23,7 @@
 -    lex.lex( lextab=lextabmod[-1], optimize=1, outputdir=os.path.join( outputdir,*lextabmod[:-1] ) )
 -    yacc.yacc( tabmodule=parsertabmod[-1], outputdir=os.path.join( outputdir, *parsertabmod[:-1] ) )
 +    lex.lex( lextab=lextabmod[-1], optimize=1 )
-+    os.rename( lextabmod[-1] + ".py", os.path.join( outputdir, *lextabmod ) )
++    os.rename( lextabmod[-1] + ".py", os.path.join( outputdir, *lextabmod ) + ".py" )
 +    yacc.yacc( tabmodule=parsertabmod[-1], optimize=1, outputdir=os.path.join( outputdir, *parsertabmod[:-1] ) )
  
  

Modified: ecell-build/trunk/pkg/rpm/ecell3.spec
===================================================================
--- ecell-build/trunk/pkg/rpm/ecell3.spec	2010-09-17 04:54:53 UTC (rev 3864)
+++ ecell-build/trunk/pkg/rpm/ecell3.spec	2010-09-22 13:43:35 UTC (rev 3865)
@@ -20,6 +20,7 @@
 Requires: python-ply >= 2.3
 Requires: glibc
 BuildRequires: make
+BuildRequires: numpy >= 1.0.3
 BuildRequires: python-devel
 BuildRequires: pygtk2 >= 2.4
 BuildRequires: python-ply >= 2.3
@@ -112,12 +113,13 @@
     infodir=%{_infodir} \
     docdir=%{_datadir}/doc/ecell3 \
     install
-rm -rf ${RPM_BUILD_ROOT}/usr/lib/python*
+# rm -rf ${RPM_BUILD_ROOT}/usr/lib/python*
 mv ${RPM_BUILD_ROOT}%{_datadir}/doc/ecell3/users-manual .
 mv ${RPM_BUILD_ROOT}%{_datadir}/doc/ecell3/api .
 mv ${RPM_BUILD_ROOT}%{_datadir}/doc/ecell3/model-editor .
 mv ${RPM_BUILD_ROOT}%{_datadir}/doc/ecell3/samples .
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/doc/ecell3
+find ${RPM_BUILD_ROOT}%{_libdir} -name "*.out" -a -type f | xargs rm -f
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -135,10 +137,13 @@
 %{_libdir}/libecs.so.*
 %{_libdir}/libemc.so.*
 %{_libdir}/ecell-3.2/dms
-%{_libdir}/python*
-%ifarch x86_64 ppc64 sparc64
-%{python_sitelib}/*
-%endif
+%{_libdir}/python*/site-packages/ecell/*.so
+%{_libdir}/python*/site-packages/ecell/*.py
+%{_libdir}/python*/site-packages/ecell/*.pyc
+%{_libdir}/python*/site-packages/ecell/analysis
+%{_libdir}/python*/site-packages/ecell/session_manager
+%{python_sitelib}/ecell/ui/__init__.py
+%{python_sitelib}/ecell/ui/__init__.pyc
 
 %files devel
 %defattr(-,root,root)
@@ -160,6 +165,7 @@
 %{_bindir}/ecell3-session-monitor
 %{_libdir}/ecell-3.2/session-monitor
 %{_datadir}/ecell-3.2/session-monitor
+%{python_sitelib}/ecell/ui/osogo
 
 %files model-editor
 %defattr(-,root,root)
@@ -168,6 +174,7 @@
 %{_bindir}/ecell3-model-editor
 %{_libdir}/ecell-3.2/model-editor
 %{_datadir}/ecell-3.2/model-editor
+%{python_sitelib}/ecell/ui/model_editor
 
 %changelog
 * Wed Jun 30 2010 Moriyoshi Koizumi <mo...@ri...>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.