[pymol] * Wed Jan 15 2014 Tim Fenn <tim.fenn at gmail.com> - 1.7.0-1.20140115svn4060 - update to 1.7 (SVN 4060)

[Timothy Fenn]

commit fadf57fc527852abed840c48d5caed49f2dbe3fa
Author: Tim Fenn <tim.fenn at gmail.com>
Date:   Wed Jan 15 22:21:46 2014 -0800

    * Wed Jan 15 2014 Tim Fenn <tim.fenn at gmail.com> - 1.7.0-1.20140115svn4060
    - update to 1.7 (SVN 4060)

 .gitignore           |    1 +
 pymol-setup.py.patch |    8 ++++----
 pymol.spec           |   13 ++++++++-----
 sources              |    2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0666f98..9a32a8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ pymol-1.4-20110402svn3938.tar.gz
 /pymol-1.5.0.1-20120213svn3978.tar.gz
 /pymol-1.5.0.2-20120218svn3982.tar.gz
 /pymol-1.6.0-20130620svn4032.tar.xz
+/pymol-1.7.0-20140115svn4060.tar.xz
diff --git a/pymol-setup.py.patch b/pymol-setup.py.patch
index 9176d01..e0eb9b0 100644
--- a/pymol-setup.py.patch
+++ b/pymol-setup.py.patch
@@ -1,7 +1,7 @@
---- setup.py_orig	2013-06-20 00:47:48.235154877 -0700
-+++ setup.py	2013-06-20 00:49:51.820016248 -0700
-@@ -237,7 +237,7 @@
- 
+--- setup.py_orig	2014-01-15 21:24:06.662449511 -0800
++++ setup.py	2014-01-15 21:25:10.789976461 -0800
+@@ -260,7 +260,7 @@
+     libs += ["GLEW"]
      libs += pyogl_libs
  
 -    ext_comp_args += ["-ffast-math", "-funroll-loops", "-O3", "-fcommon"]
diff --git a/pymol.spec b/pymol.spec
index 6beae51..f245eb0 100644
--- a/pymol.spec
+++ b/pymol.spec
@@ -2,16 +2,16 @@
 
 Summary: PyMOL Molecular Graphics System
 Name: pymol
-Version: 1.6.0
-Release: 3.20130620svn4032%{?dist}
+Version: 1.7.0
+Release: 1.20140115svn4060%{?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 export -r 4032 svn://svn.code.sf.net/p/pymol/code/trunk/pymol pymol-1.6.0
-#  tar cvJf pymol-1.6.0-20130620svn4032.tar.xz pymol-1.6.0
-Source0: pymol-1.6.0-20130620svn4032.tar.xz
+#  svn export -r 4060 svn://svn.code.sf.net/p/pymol/code/trunk/pymol pymol-1.7.0
+#  tar cvJf pymol-1.7.0-20140115svn4060.tar.xz pymol-1.7.0
+Source0: pymol-1.7.0-20140115svn4060.tar.xz
 # 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
@@ -129,6 +129,9 @@ rm -rf %{buildroot}
 %{python_sitearch}/pmg_wx/
 
 %changelog
+* Wed Jan 15 2014 Tim Fenn <tim.fenn at gmail.com> - 1.7.0-1.20140115svn4060
+- update to 1.7 (SVN 4060)
+
 * Mon Nov 18 2013 Dave Airlie <airlied at redhat.com> - 1.6.0-3.20130620svn4032
 - rebuilt for GLEW 1.10
 
diff --git a/sources b/sources
index 1ffa392..446ae1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f1e934e10c12f5ad3e1379c33ecb98a  pymol-1.6.0-20130620svn4032.tar.xz
+11a31b18c1a2a6b58cae8a037bce2e17  pymol-1.7.0-20140115svn4060.tar.xz