[pymol/el6/master] update to 1.3

[Timothy Fenn]

commit cba22008cfaf60818c583b3851f25a172093612f
Author: Tim Fenn <fenn at stanford.edu>
Date:   Thu Aug 26 14:59:25 2010 -0700

    update to 1.3

 .gitignore    |    2 ++
 pymol.desktop |    2 +-
 pymol.spec    |   30 +++++++++++++++++++++++-------
 sources       |    4 ++--
 4 files changed, 28 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e4d77d3..4656721 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 pymol-1.2-20091006svn3866.tar.gz
 pymol-setup.py.patch
+/pymol-1.3-20100705svn3911.tar.gz
+/pymol-setup.py.patch
diff --git a/pymol.desktop b/pymol.desktop
index 1d75c19..cc95f4d 100644
--- a/pymol.desktop
+++ b/pymol.desktop
@@ -7,4 +7,4 @@ Exec=pymol
 Icon=pymol-32
 Terminal=false
 Type=Application
-Categories=Graphics;
+Categories=Graphics;Science
diff --git a/pymol.spec b/pymol.spec
index e5eb4e6..61f4caf 100644
--- a/pymol.spec
+++ b/pymol.spec
@@ -2,16 +2,16 @@
 
 Summary: PyMOL Molecular Graphics System
 Name: pymol
-Version: 1.2
-Release: 9.20091006svn3866%{?dist}
+Version: 1.3
+Release: 3.20100705svn3911%{?dist}
 License: MIT and BSD and ZPLv2.0 and Bitstream Vera and OFL
 Group: Applications/Engineering
 URL: http://www.pymol.org
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn co -r 3866 https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.2
-#  tar cvzf pymol-1.2-20091006svn3866.tar.gz pymol-1.2
-Source0: pymol-1.2-20091006svn3866.tar.gz
+#  svn co -r 3911 https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.3
+#  tar cvzf pymol-1.3-20100705svn3911.tar.gz pymol-1.3
+Source0: pymol-1.3-20100705svn3911.tar.gz
 # the source for this xpm pulled from:
 # https://launchpad.net/ubuntu/intrepid/+source/pymol/1.1~beta3-3/+files/pymol_1.1~beta3-3.diff.gz
 Source1: %{name}-32.xpm
@@ -23,7 +23,9 @@ BuildRequires: freeglut-devel
 BuildRequires: freetype-devel
 BuildRequires: libGL-devel
 BuildRequires: libpng-devel
+BuildRequires: python-devel
 BuildRequires: python-setuptools-devel
+Requires: apbs
 Requires: python-numeric
 Requires: python-pmw
 Requires: tcl
@@ -107,8 +109,22 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python_sitearch}/pmg_wx/
 
 %changelog
-* Fri Oct 23 2009 Tim Fenn <fenn at stanford.edu> - 1.2-9.20091006svn3866
-- rebuild for F12
+* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 1.3-3.20100705svn3911
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Tue Jul 06 2010 Tim Fenn <fenn at stanford.edu> - 1.3-2.20100705svn3911
+- include pymol-setup.py.patch
+
+* Mon Jul 05 2010 Tim Fenn <fenn at stanford.edu> - 1.3-1.20100705svn3911
+- update to SVN 3911, version 1.3
+
+* Mon Mar 15 2010 Tim Fenn <fenn at stanford.edu> - 1.2-10.20100315svn3897
+- update to SVN 3897
+
+* Sun Nov 29 2009 Tim Fenn <fenn at stanford.edu> - 1.2-9.20091006svn3866
+- pull in python-devel
+- add apbs as a Requires
+- minor modification to pymol.desktop
 
 * Tue Oct 06 2009 Tim Fenn <fenn at stanford.edu> - 1.2-8.20091006svn3866
 - update to SVN 3866, 1.2r2
diff --git a/sources b/sources
index b79303f..39fa85a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-2b912c7d3f28df5d65f3b0afa4b8b08c  pymol-1.2-20091006svn3866.tar.gz
-5d4c9a9de18416892f303f5c202f3198  pymol-setup.py.patch
+cd4f4b5a73b1508f9eda8b8ee532ef81  pymol-1.3-20100705svn3911.tar.gz
+ea594a1eb751d7fe187553da1966ab16  pymol-setup.py.patch