rpms/pymol/EL-5 pymol.desktop,1.1,1.2 pymol.spec,1.2,1.3

[Timothy Fenn]

Author: timfenn

Update of /cvs/pkgs/rpms/pymol/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11193

Modified Files:
	pymol.desktop pymol.spec 
Log Message:
* Wed Oct 29 2008 Tim Fenn <fenn at stanford.edu> - 1.1-12-20081015svn3468
- fix vendor flag, remove space from pymol.desktop




Index: pymol.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/EL-5/pymol.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pymol.desktop	22 Oct 2008 01:00:57 -0000	1.1
+++ pymol.desktop	30 Oct 2008 00:12:47 -0000	1.2
@@ -1,4 +1,4 @@
-[Desktop Entry] 
+[Desktop Entry]
 Encoding=UTF-8
 Name=PyMOL
 GenericName=Python Molecular Graphics


Index: pymol.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pymol/EL-5/pymol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pymol.spec	28 Oct 2008 19:27:27 -0000	1.2
+++ pymol.spec	30 Oct 2008 00:12:47 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: PyMOL Molecular Graphics System
 Name: pymol
 Version: 1.1
-Release: 11.20081015svn3468%{?dist}
+Release: 12.20081015svn3468%{?dist}
 License: MIT and BSD and ZPLv2.0 and Bitstream Vera and OFL
 Group: Applications/Engineering
 URL: http://www.pymol.org
@@ -86,7 +86,7 @@
 mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
 install -p -m 755 pymol ${RPM_BUILD_ROOT}%{_bindir}/
 
-desktop-file-install --vendor="" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
+desktop-file-install --vendor=fedora --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE2}
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 install -p -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/
 
@@ -101,7 +101,7 @@
 %{python_sitearch}/pmg_tk/
 %{python_sitearch}/pymol/
 %{_bindir}/pymol
-%{_datadir}/applications/pymol.desktop
+%{_datadir}/applications/fedora-pymol.desktop
 %{_datadir}/pixmaps/pymol-32.xpm
 
 %files wxpython
@@ -109,6 +109,9 @@
 %{python_sitearch}/pmg_wx/
 
 %changelog
+* Wed Oct 29 2008 Tim Fenn <fenn at stanford.edu> - 1.1-12-20081015svn3468
+- fix vendor flag, remove space from pymol.desktop
+
 * Tue Oct 28 2008 Tim Fenn <fenn at stanford.edu> - 1.1-11-20081015svn3468
 - add vendor flag to desktop-file-install