[pymol] * Sat Jul 08 2012 Tim Fenn <tim.fenn at gmail.com> - 1.5.0.2-3.20120218svn3982 - remove web module to f

[Timothy Fenn]

commit ef25ff7218775618c81cf174bcef8eb03653a84e
Author: Tim Fenn <fenn at stanford.edu>
Date:   Mon Jul 9 21:33:59 2012 -0700

    * Sat Jul 08 2012 Tim Fenn <tim.fenn at gmail.com> - 1.5.0.2-3.20120218svn3982
    - remove web module to fix conflict with python-webpy, reported upstream

 pymol-setup.py.patch |   19 +++++++++++--------
 pymol.spec           |    6 ++++--
 2 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/pymol-setup.py.patch b/pymol-setup.py.patch
index 9201a93..a8a6847 100644
--- a/pymol-setup.py.patch
+++ b/pymol-setup.py.patch
@@ -1,5 +1,5 @@
---- setup.py_orig	2012-02-13 18:53:17.485319239 -0800
-+++ setup.py	2012-02-13 20:29:20.955343174 -0800
+--- setup.py_orig	2012-07-07 12:46:20.032819982 -0700
++++ setup.py	2012-07-07 12:48:00.632209204 -0700
 @@ -197,10 +197,7 @@
                     ("_PYMOL_GL_CALLLISTS",None),
                     ("OPENGL_ES_2",None),
@@ -12,15 +12,18 @@
      ext_link_args = []
  
  
-@@ -230,6 +227,7 @@
+@@ -230,9 +227,7 @@
                   'pymol/opengl/glu',
                   'pymol/opengl/glut',
                   'pymol/wizard',
-+                 'pymol2',
-                  'web',
-                  'web/examples',
-                  'web/javascript', ],
-@@ -488,19 +486,6 @@
+-                 'web',
+-                 'web/examples',
+-                 'web/javascript', ],
++                 'pymol2', ],
+     ext_modules = [
+         Extension("pymol._cmd", [
+                 "modules/cealign/src/ccealignmodule.cpp",
+@@ -488,19 +483,6 @@
                    )
          ])
  
diff --git a/pymol.spec b/pymol.spec
index eb5b500..127bcc7 100644
--- a/pymol.spec
+++ b/pymol.spec
@@ -3,7 +3,7 @@
 Summary: PyMOL Molecular Graphics System
 Name: pymol
 Version: 1.5.0.2
-Release: 2.20120218svn3982%{?dist}
+Release: 3.20120218svn3982%{?dist}
 License: MIT and BSD and ZPLv2.0 and Bitstream Vera and OFL
 Group: Applications/Engineering
 URL: http://www.pymol.org
@@ -111,7 +111,6 @@ rm -rf %{buildroot}
 %{python_sitearch}/pmg_tk/
 %{python_sitearch}/pymol/
 %{python_sitearch}/pymol2/
-%{python_sitearch}/web/
 %{_bindir}/pymol
 %{_datadir}/applications/pymol.desktop
 %{_datadir}/pixmaps/pymol-32.xpm
@@ -121,6 +120,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/pmg_wx/
 
 %changelog
+* Sat Jul 08 2012 Tim Fenn <tim.fenn at gmail.com> - 1.5.0.2-3.20120218svn3982
+- remove web module to fix conflict with python-webpy, reported upstream
+
 * Tue May 01 2012 Gökçen Eraslan <gokcen.eraslan at gmail.com> - 1.5.0.2-2.20120218svn3982
 - Validate desktop file and add various mimetypes