rpms/pymol/devel import.log, NONE, 1.1 pymol-32.xpm, NONE, 1.1 pymol.desktop, NONE, 1.1 pymol.spec, NONE, 1.1 setup.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Timothy Fenn timfenn at fedoraproject.org
Mon Oct 20 20:30:16 UTC 2008 

Author: timfenn

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

Modified Files:
	.cvsignore sources 
Added Files:
	import.log pymol-32.xpm pymol.desktop pymol.spec setup.patch 
Log Message:
* Mon Oct 20 2008 Tim Fenn <fenn at stanford.edu> - 1.1-9-20081015svn3468
- initial CVS commit




--- NEW FILE import.log ---
pymol-1_1-9_20081015svn3468_f8:HEAD:pymol-1.1-9.20081015svn3468.f8.src.rpm:1224534454


--- NEW FILE pymol-32.xpm ---
/* XPM */
static char *pymol-32[] = {
/* columns rows colors chars-per-pixel */
"32 32 95 2",
"   c #003700370037",
".  c #081B07E9081C",
"X  c #0A540A370A51",
"o  c #143414261422",
"O  c #184B17F3184C",
"+  c #1BF11BC81BD3",
"@  c #241423DC23C9",
"#  c #284228692808",
"$  c #2C422C062BE9",
"%  c #30CE3054302B",
"&  c #355B352134CF",
"*  c #383D3824381A",
"=  c #38C0387337F1",
"-  c #3CB03C623C87",
";  c #444C440B4469",
":  c #496447E047E8",
">  c #48D1483A48FE",
",  c #48E6492D47DA",
"<  c #4B5F4B0D4B1A",
"1  c #4CBE52894D17",
"2  c #50FE4FC95007",
"3  c #510E4FD45277",
"4  c #54AB5496549B",
"5  c #578C57C85895",
"6  c #55695C3F555A",
"7  c #5D8154E25546",
"8  c #5BAC5C3B5BD6",
"9  c #5C5B5D5169FB",
"0  c #5CA860527367",
"q  c #5F3163BA5F68",
"w  c #5F2E697F5FA2",
"e  c #56F3739C56C6",
"r  c #5CFB71755D42",
"t  c #5F447BF65F64",
"y  c #65DA5EB35D23",
"u  c #643C6514644E",
"i  c #659E693965D7",
"p  c #697967376758",
"a  c #6D696B4D628D",
"s  c #6C316C376BDD",
"d  c #66A5678C75D0",
"f  c #6E906EC87140",
"g  c #62B07546626B",
"h  c #6DB0732B6D97",
"j  c #6BF27BF56B07",
"k  c #7E726B636B52",
"l  c #792474B5705E",
"z  c #73AC744B73DE",
"x  c #728074CD7D3E",
"c  c #757E7C4D756B",
"v  c #77DE78A27995",
"b  c #7913777771CB",
"n  c #79817B257834",
"m  c #7B6D7ED67B5F",
"M  c #7FBB801F80FA",
"N  c #5BAE826F5B80",
"B  c #64FF814B684F",
"V  c #684783BE687C",
"C  c #69D287AC69CC",
"Z  c #6D8688C36DE0",
"A  c #749582407463",
"S  c #780C884978A0",
"D  c #754C8BC174EA",
"F  c #7CD183A07CFA",
"G  c #7D598C757BED",
"H  c #778C939C77CE",
"J  c #768F9B2C7725",
"K  c #7D8595CA7D73",
"L  c #7A1CA39A7A2F",
"P  c #7EEE81418629",
"I  c #7FC689BD81DA",
"U  c #82777FC17CF8",
"Y  c #847382987906",
"T  c #8DE587A77A14",
"R  c #97D68D477B59",
"E  c #9ACD894776D4",
"W  c #856D85E48545",
"Q  c #85A28D6785F1",
"!  c #8B258DC38B79",
"~  c #844693F38485",
"^  c #86FC9A2E87AE",
"/  c #8CF894938CA8",
"(  c #89449E06880D",
")  c #8CE19C4C8D55",
"_  c #90409141909E",
"`  c #91AD98318CD2",
"'  c #9422966F93FD",
"]  c #94AE9CAA9518",
"[  c #9D659E3E9CC8",
"{  c #9413A6A494B8",
"}  c #9711ADA396F8",
"|  c #9D2EA5F79CDD",
" . c #98BCAB5C9889",
".. c #9BD4ACC89B79",
"X. c #A5B3AB5AA5D9",
/* pixels */
"                                                                ",
"                                                                ",
"                                                                ",
"                                                                ",
"                                      o X .                     ",
"                                    + ; : $ .                   ",
"                                  X 4 z m p > # .               ",
"                                  O 8 m ' m z 4 @               ",
"                                . $ u P { ) _ h - o             ",
"                                . < W ]  . .^ f > O             ",
"                O + o           + s [ X...| ) s 2 #             ",
"              O : 4 - # o       @ s ' | { _ ~ w 8 - .           ",
"              # 8 z i z u * .   O < z S L F A w 4 - .           ",
"            . % y F ! _ W u @   . $ 4 u J D A 4 : # .           ",
"            . - s Q ) ] / s & .   # 8 n ( H V 4 > #             ",
"            . - s Q ) ^ G u < +   O q W [ S B < 3 - .           ",
"            . $ 8 F / Q K m p - . . > z W z 0 9 5 : o           ",
"              O > y c Q ^ / U 5 o . $ < 5 8 d x q ; o           ",
"                $ > i G ~ ' / i @ # - - - u W ~ z 8 +           ",
"                O * 6 z Q ' W 8 - > 8 > < z Q / W f #           ",
"                . + ; u n Y 8 4 8 8 r 1 , h Q ` W s #           ",
"                    @ 4 s k y q h V N e 1 w G ( Y 5 O           ",
"                    . % 3 5 a Z K j 6 g C g g D z 9 O           ",
"                      O - > u A ~ z p j H s 5 c Q p #           ",
"                        o - p c K G U T Y f 8 u i 4 O           ",
"                        . - u I Z G R E b u ; % & @ .           ",
"                        . ; z b 8 h b a 8 5 % .                 ",
"                          $ 5 4 < 8 y 5 4 : +                   ",
"                          . O O O @ - ; - # .                   ",
"                                    . o X                       ",
"                                                                ",
"                                                                "
};


--- NEW FILE pymol.desktop ---
[Desktop Entry] 
Encoding=UTF-8
Name=PyMOL
GenericName=Python Molecular Graphics
Comment=Python Molecular Graphics
Exec=pymol
Icon=pymol-32
Terminal=false
Type=Application
Categories=Graphics;


--- NEW FILE pymol.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Summary: PyMOL Molecular Graphics System
Name: pymol
Version: 1.1
Release: 9.20081015svn3468%{?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
# 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
Source2: %{name}.desktop
Patch0: setup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
BuildRequires: freeglut-devel
BuildRequires: freetype-devel
BuildRequires: libGL-devel
BuildRequires: libpng-devel
BuildRequires: python-setuptools-devel
Requires: python-numeric
Requires: python-pmw
Requires: tcl
Requires: tk

%description
PyMOL is a molecular graphics system with an embedded Python
interpreter designed for real-time visualization and rapid generation
of high-quality molecular graphics images and animations. It is fully
extensible and available free to everyone via the "Python"
license. Although a newcomer to the field, PyMOL can already be used
to generate stunning images and animations with ease. It can also
perform many other valuable tasks (such as editing PDB files) to
assist you in your research.

%package wxpython
Summary: wxpython interface for PyMOL
Group: Applications/Engineering
Requires: wxPython
Requires: %{name} = %{version}-%{release}

%description wxpython

the pymol-wxpython includes the pmg_wx module for developers to access
pymol via wxpython widgets.

%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

%install
rm -rf ${RPM_BUILD_ROOT}
%{__python} -c 'import setuptools; execfile("setup.py")' install --skip-build --root ${RPM_BUILD_ROOT}
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/
cp -pr data/pymol/matrices/BLOSUM62 ${RPM_BUILD_ROOT}%{python_sitearch}/pymol/pymol_path/data/pymol/matrices/

mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
install -p -m 755 pymol ${RPM_BUILD_ROOT}%{_bindir}/

desktop-file-install --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root,-)
%doc AUTHORS LICENSE DEVELOPERS README
%{python_sitearch}/*egg-info
%{python_sitearch}/chempy/
%{python_sitearch}/pmg_tk/
%{python_sitearch}/pymol/
%{_bindir}/pymol
%{_datadir}/applications/pymol.desktop
%{_datadir}/pixmaps/pymol-32.xpm

%files wxpython
%defattr(-,root,root,-)
%{python_sitearch}/pmg_wx/

%changelog
* Mon Oct 20 2008 Tim Fenn <fenn at stanford.edu> - 1.1-9-20081015svn3468
- minor edit to defattr

* Sat Oct 18 2008 Tim Fenn <fenn at stanford.edu> - 1.1-8-20081015svn3468
- separate pmg_wx into -wxpython package, minor patch fix

* Fri Oct 17 2008 Tim Fenn <fenn at stanford.edu> - 1.1-7-20081015svn3468
- patch setup.py to remove opt flags

* Thu Oct 16 2008 Tim Fenn <fenn at stanford.edu> - 1.1-6-20081015svn3468
- SVN bump, minor edit to pymol.desktop

* Tue Oct 07 2008 Tim Fenn <fenn at stanford.edu> - 1.1-5-20080912svn3419
- fix optflags, svn co comment, buildrequires/requires

* Sun Oct 05 2008 Tim Fenn <fenn at stanford.edu> - 1.1-4-20080912svn3419
- fix license, add AUTHORS to %%doc, add python-numeric to requires
- fix optflags, permissions problems, minor fixes

* Thu Oct 02 2008 Tim Fenn <fenn at stanford.edu> - 1.1-3-20080912svn3419
- fix release tag, add egg-info, minor fixes

* Sun Sep 28 2008 Tim Fenn <fenn at stanford.edu> - 1.1-2
- add desktop file, fix buildrequires, fix SourceURL

* Fri Sep 12 2008 Tim Fenn <fenn at stanford.edu> - 1.1-1
- initial build

setup.patch:

--- NEW FILE setup.patch ---
--- setup_old.py	2008-10-17 12:05:14.000000000 -0700
+++ setup.py	2008-10-17 12:05:40.000000000 -0700
@@ -148,7 +148,7 @@
 # VMD plugin support                    
 #                    ("_PYMOL_VMD_PLUGINS",None),
                     ("_HAVE_LIBPNG",None)]
-    ext_comp_args=["-ffast-math","-funroll-loops","-O3"]
+    ext_comp_args=[]
     ext_link_args=[]
   
 setup ( # Distribution meta-data


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Oct 2008 08:46:05 -0000	1.1
+++ .cvsignore	20 Oct 2008 20:29:45 -0000	1.2
@@ -0,0 +1 @@
+pymol-1.1-20081015svn3468.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Oct 2008 08:46:05 -0000	1.1
+++ sources	20 Oct 2008 20:29:46 -0000	1.2
@@ -0,0 +1 @@
+1466459dc8ea600ba8ed6f65fe32b409  pymol-1.1-20081015svn3468.tar.gz

More information about the fedora-extras-commits mailing list