[pymol] - include missing data directory bits - remove pre script - remove pymol_path completely, add patch

[Timothy Fenn]

commit bf2f5dcd1dfdefea4f39d4fec94083f53f0fa2fa
Author: Tim Fenn <fenn at stanford.edu>
Date:   Tue Jun 7 11:41:31 2011 -0700

    - include missing data directory bits
    - remove pre script
    - remove pymol_path completely, add patch to init.py to set it properly

 pymol-init.py.patch |   11 +++++++++++
 pymol.spec          |   18 +++++++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/pymol-init.py.patch b/pymol-init.py.patch
new file mode 100644
index 0000000..5a07001
--- /dev/null
+++ b/pymol-init.py.patch
@@ -0,0 +1,11 @@
+--- modules/pymol/__init__.py_orig	2011-06-07 01:42:45.977841339 -0700
++++ modules/pymol/__init__.py	2011-06-07 01:43:00.516692064 -0700
+@@ -142,7 +142,7 @@
+                 if (pymol_file[0:1] not in [ '\\', '/' ]) and pymol_file[1:2]!=':': 
+                     pymol_file = os.getcwd()+"/"+pymol_file # make path absolute
+ 
+-                pymol_path = re.sub(r"[\/\\][^\/\\]*$","/pymol_path",pymol_file)
++                pymol_path = re.sub(r"[\/\\][^\/\\]*$","",pymol_file)
+ 
+                 if os.path.isdir(pymol_path):
+                     os.environ['PYMOL_PATH'] = pymol_path
diff --git a/pymol.spec b/pymol.spec
index f04773d..96b3327 100644
--- a/pymol.spec
+++ b/pymol.spec
@@ -3,7 +3,7 @@
 Summary: PyMOL Molecular Graphics System
 Name: pymol
 Version: 1.4.1
-Release: 3.20110502svn3947%{?dist}
+Release: 4.20110502svn3947%{?dist}
 License: MIT and BSD and ZPLv2.0 and Bitstream Vera and OFL
 Group: Applications/Engineering
 URL: http://www.pymol.org
@@ -17,6 +17,7 @@ Source0: pymol-1.4.1-20110502svn3947.tar.gz
 Source1: %{name}-32.xpm
 Source2: %{name}.desktop
 Patch0: pymol-setup.py.patch
+Patch1: pymol-init.py.patch
 BuildRequires: desktop-file-utils
 BuildRequires: freeglut-devel
 BuildRequires: freetype-devel
@@ -55,14 +56,10 @@ Requires: %{name} = %{version}-%{release}
 the pymol-wxpython includes the pmg_wx module for developers to access
 pymol via wxpython widgets.
 
-%pre
-if [ $1 -gt 1 ]; then
-   rm -rf %{python_sitearch}/pymol/pymol_path
-fi
-
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 sed -i 1d modules/pmg_tk/startup/apbs_tools.py
 
 %build
@@ -72,9 +69,11 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")'
 rm -rf ${RPM_BUILD_ROOT}
 %{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root ${RPM_BUILD_ROOT}
 echo "#!/bin/sh" > pymol
+echo "export PYMOL_PATH=%{python_sitearch}/pymol" >> pymol
 echo "%{__python} %{python_sitearch}/pymol/__init__.py \$*" >> pymol
 
 cp -pr data examples test scripts ${RPM_BUILD_ROOT}%{python_sitearch}/pymol
+
 find ${RPM_BUILD_ROOT}%{python_sitearch}/pymol -type d -name ".svn" -prune -exec rm -rf {} \;
 rm -rf ${RPM_BUILD_ROOT}%{python_sitearch}/pymol/examples/devel/link_demo.py
 rm -rf ${RPM_BUILD_ROOT}%{python_sitearch}/pymol/examples/devel/particle01.py
@@ -84,7 +83,7 @@ rm -rf ${RPM_BUILD_ROOT}%{python_sitearch}/pymol/test/inp/B05.py
 rm -rf ${RPM_BUILD_ROOT}%{python_sitearch}/pymol/test/inp/B11.py
 rm -rf ${RPM_BUILD_ROOT}%{python_sitearch}/pymol/test/ref/T01.log
 
-ln -s %{python_sitearch}/pymol ${RPM_BUILD_ROOT}%{python_sitearch}/pymol/pymol_path
+# ln -s %{python_sitearch}/pymol ${RPM_BUILD_ROOT}%{python_sitearch}/pymol/pymol_path
 
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 install -p -m 755 pymol ${RPM_BUILD_ROOT}%{_bindir}/
@@ -114,6 +113,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python_sitearch}/pmg_wx/
 
 %changelog
+* Tue Jun 07 2011 Tim Fenn <fenn at stanford.edu> - 1.4.1-4.20110502svn3947
+- include missing data directory bits
+- remove pre script
+- remove pymol_path completely, add patch to init.py to set it properly
+
 * Wed May 18 2011 Tim Fenn <fenn at stanford.edu> - 1.4.1-3.20110502svn3947
 - remove old pymol_path directory if necessary using pre script