rpms/pymol/devel pymol.desktop,1.2,1.3 pymol.spec,1.14,1.15

[Timothy Fenn]

Author: timfenn

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

Modified Files:
	pymol.desktop pymol.spec 
Log Message:
* 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




Index: pymol.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/pymol.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pymol.desktop	29 Oct 2008 23:57:52 -0000	1.2
+++ pymol.desktop	30 Nov 2009 07:30:10 -0000	1.3
@@ -7,4 +7,4 @@ Exec=pymol
 Icon=pymol-32
 Terminal=false
 Type=Application
-Categories=Graphics;
+Categories=Graphics;Science


Index: pymol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/pymol.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- pymol.spec	7 Oct 2009 07:01:51 -0000	1.14
+++ pymol.spec	30 Nov 2009 07:30:10 -0000	1.15
@@ -3,7 +3,7 @@
 Summary: PyMOL Molecular Graphics System
 Name: pymol
 Version: 1.2
-Release: 8.20091006svn3866%{?dist}
+Release: 9.20091006svn3866%{?dist}
 License: MIT and BSD and ZPLv2.0 and Bitstream Vera and OFL
 Group: Applications/Engineering
 URL: http://www.pymol.org
@@ -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,6 +109,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{python_sitearch}/pmg_wx/
 
 %changelog
+* 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