rpms/pymol/devel .cvsignore, 1.2, 1.3 pymol.spec, 1.6, 1.7 sources, 1.2, 1.3

[Timothy Fenn]

Author: timfenn

Update of /cvs/pkgs/rpms/pymol/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32153

Modified Files:
	.cvsignore pymol.spec sources 
Log Message:
* Tue Feb 24 2009 Tim Fenn <fenn at stanford.edu> - 1.2-1.20090224svn3615
- update to trunk svn rev 3615, fixes python 2.6 incompatibility




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Oct 2008 20:29:45 -0000	1.2
+++ .cvsignore	25 Feb 2009 02:04:03 -0000	1.3
@@ -1 +1 @@
-pymol-1.1-20081015svn3468.tar.gz
+pymol-1.2-20090224svn3615.tar.gz


Index: pymol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/pymol.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pymol.spec	29 Nov 2008 18:16:50 -0000	1.6
+++ pymol.spec	25 Feb 2009 02:04:03 -0000	1.7
@@ -2,16 +2,16 @@
 
 Summary: PyMOL Molecular Graphics System
 Name: pymol
-Version: 1.1
-Release: 14.20081015svn3468%{?dist}
+Version: 1.2
+Release: 1.20090224svn3615%{?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 3468 https://pymol.svn.sourceforge.net/svnroot/pymol/branches/b11/pymol pymol-1.1
-#  tar cvzf pymol-1.1-20081015svn3468.tar.gz pymol-1.1
-Source0: pymol-1.1-20081015svn3468.tar.gz
+#  svn co -r 3615 https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.2
+#  tar cvzf pymol-1.2-20090224svn3615.tar.gz pymol-1.2
+Source0: pymol-1.2-20090224svn3615.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
@@ -53,9 +53,6 @@
 %prep
 %setup -q
 %patch0 -p0
-chmod 644 contrib/champ/feedback2.c
-chmod 644 contrib/champ/feedback2.h
-chmod 644 contrib/champ/err2.c
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} -c 'import setuptools; execfile("setup.py")' build
@@ -66,9 +63,6 @@
 echo "#!/bin/sh" > pymol
 echo "%{__python} %{python_sitearch}/pymol/__init__.py \$*" >> pymol
 
-chmod 755 ${RPM_BUILD_ROOT}%{python_sitearch}/pmg_tk/startup/apbs_tools.py
-chmod 755 ${RPM_BUILD_ROOT}%{python_sitearch}/chempy/cex.py
-
 mkdir -p ${RPM_BUILD_ROOT}%{python_sitearch}/pymol/pymol_path/data/pymol/matrices
 cp -pr data/pymol/splash.png ${RPM_BUILD_ROOT}%{python_sitearch}/pymol/pymol_path/data/pymol/
 cp -pr data/pymol/cmyk.png ${RPM_BUILD_ROOT}%{python_sitearch}/pymol/pymol_path/data/pymol/
@@ -109,6 +103,9 @@
 %{python_sitearch}/pmg_wx/
 
 %changelog
+* Tue Feb 24 2009 Tim Fenn <fenn at stanford.edu> - 1.2-1.20090224svn3615
+- update to trunk svn rev 3615, fixes python 2.6 incompatibility
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 1.1-14.20081015svn3468
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Oct 2008 20:29:46 -0000	1.2
+++ sources	25 Feb 2009 02:04:03 -0000	1.3
@@ -1 +1 @@
-1466459dc8ea600ba8ed6f65fe32b409  pymol-1.1-20081015svn3468.tar.gz
+12b4c9a6f9d23b4fc555d3319086074a  pymol-1.2-20090224svn3615.tar.gz