rpms/pymol/devel .cvsignore, 1.3, 1.4 pymol.spec, 1.7, 1.8 setup.patch, 1.1, 1.2 sources, 1.3, 1.4

Timothy Fenn timfenn at fedoraproject.org
Thu Feb 26 19:53:46 UTC 2009


Author: timfenn

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

Modified Files:
	.cvsignore pymol.spec setup.patch sources 
Log Message:
* Thu Feb 26 2009 Tim Fenn <fenn at stanford.edu> - 1.2-2.20090226svn3616
- include pymol2 module, update to SVN 3616 (fixes cmd2.py)




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Feb 2009 02:04:03 -0000	1.3
+++ .cvsignore	26 Feb 2009 19:53:16 -0000	1.4
@@ -1 +1 @@
-pymol-1.2-20090224svn3615.tar.gz
+pymol-1.2-20090226svn3616.tar.gz


Index: pymol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/pymol.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pymol.spec	25 Feb 2009 02:04:03 -0000	1.7
+++ pymol.spec	26 Feb 2009 19:53:16 -0000	1.8
@@ -3,15 +3,15 @@
 Summary: PyMOL Molecular Graphics System
 Name: pymol
 Version: 1.2
-Release: 1.20090224svn3615%{?dist}
+Release: 2.20090226svn3616%{?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 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
+#  svn co -r 3616 https://pymol.svn.sourceforge.net/svnroot/pymol/trunk/pymol pymol-1.2
+#  tar cvzf pymol-1.2-20090226svn3616.tar.gz pymol-1.2
+Source0: pymol-1.2-20090226svn3616.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
@@ -94,6 +94,7 @@
 %{python_sitearch}/chempy/
 %{python_sitearch}/pmg_tk/
 %{python_sitearch}/pymol/
+%{python_sitearch}/pymol2/
 %{_bindir}/pymol
 %{_datadir}/applications/pymol.desktop
 %{_datadir}/pixmaps/pymol-32.xpm
@@ -103,6 +104,9 @@
 %{python_sitearch}/pmg_wx/
 
 %changelog
+* Thu Feb 26 2009 Tim Fenn <fenn at stanford.edu> - 1.2-2.20090226svn3616
+- include pymol2 module, update to SVN 3616 (fixes cmd2.py)
+
 * 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
 

setup.patch:

Index: setup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/setup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setup.patch	20 Oct 2008 20:29:46 -0000	1.1
+++ setup.patch	26 Feb 2009 19:53:16 -0000	1.2
@@ -1,5 +1,5 @@
---- setup_old.py	2008-10-17 12:05:14.000000000 -0700
-+++ setup.py	2008-10-17 12:05:40.000000000 -0700
+--- setup.py_orig	2009-02-25 19:01:43.000000000 -0800
++++ setup.py	2009-02-25 19:02:34.000000000 -0800
 @@ -148,7 +148,7 @@
  # VMD plugin support                    
  #                    ("_PYMOL_VMD_PLUGINS",None),
@@ -9,3 +9,13 @@
      ext_link_args=[]
    
  setup ( # Distribution meta-data
+@@ -171,7 +171,8 @@
+                 'pymol/opengl/gl',
+                 'pymol/opengl/glu',
+                 'pymol/opengl/glut',
+-                'pymol/wizard'],
++                'pymol/wizard',
++                'pymol2'],
+ 	ext_modules = [
+     Extension("pymol._cmd", [
+     "ov/src/OVContext.c",


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Feb 2009 02:04:03 -0000	1.3
+++ sources	26 Feb 2009 19:53:16 -0000	1.4
@@ -1 +1 @@
-12b4c9a6f9d23b4fc555d3319086074a  pymol-1.2-20090224svn3615.tar.gz
+0852349b9a037dd46c7a9b1fc99eb35f  pymol-1.2-20090226svn3616.tar.gz




More information about the fedora-extras-commits mailing list