rpms/PySolFC/devel PySolFC-desktop-exec.patch, NONE, 1.1 PySolFC.spec, 1.10, 1.11 pysol-start-script, 1.1, 1.2

[Stewart Adam]

Author: firewing

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

Modified Files:
	PySolFC.spec pysol-start-script 
Added Files:
	PySolFC-desktop-exec.patch 
Log Message:
* Mon Feb 22 2010 Stewart Adam <s.adam at diffingo.com> - 2.0-2
- Patch desktop file to use pysol and not pysol.py for exec
- Force pygame as sound mod, makes PySolFC work with PulseAudio


PySolFC-desktop-exec.patch:
 pysol.desktop |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE PySolFC-desktop-exec.patch ---
--- data/pysol.desktop.orig	2010-02-22 21:36:45.355136299 -0500
+++ data/pysol.desktop	2010-02-22 21:36:52.171434787 -0500
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=PySol Fan Club Edition
-Exec=pysol.py
+Exec=pysol
 Terminal=false
 Type=Application
 Categories=Game;CardGame;


Index: PySolFC.spec
===================================================================
RCS file: /cvs/pkgs/rpms/PySolFC/devel/PySolFC.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- PySolFC.spec	31 Jan 2010 01:18:25 -0000	1.10
+++ PySolFC.spec	23 Feb 2010 04:12:58 -0000	1.11
@@ -5,18 +5,21 @@
 
 Name:           PySolFC
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A collection of solitare card games
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://pysolfc.sourceforge.net
 Source0:        http://downloads.sourceforge.net/pysolfc/%{name}-%{version}.tar.bz2
 Source1:        pysol-start-script
+Patch0:         PySolFC-desktop-exec.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+BuildArch:      noarch
 
 # optional but nice to have
 Requires:       python-imaging, tile
+# used to get sound working with PulseAudio
+Requires:       pygame
 # really required
 Requires:       tcl
 Requires:       tk, tix, tkinter
@@ -34,6 +37,7 @@ written plug-ins, an integrated HTML hel
 
 %prep
 %setup -q
+%patch0 -p0 -b .desktop-exec
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -70,6 +74,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 22 2010 Stewart Adam <s.adam at diffingo.com> - 2.0-2
+- Patch desktop file to use pysol and not pysol.py for exec
+- Force pygame as sound mod, makes PySolFC work with PulseAudio
+
 * Mon Jan 18 2010 Stewart Adam <s.adam at diffingo.com> - 2.0-1
 - Update to 2.0
 


Index: pysol-start-script
===================================================================
RCS file: /cvs/pkgs/rpms/PySolFC/devel/pysol-start-script,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pysol-start-script	23 Oct 2007 02:17:52 -0000	1.1
+++ pysol-start-script	23 Feb 2010 04:12:58 -0000	1.2
@@ -1,3 +1,3 @@
 #!/bin/sh
-/usr/share/PySolFC/pysol.py $*
+/usr/share/PySolFC/pysol.py "$@" --sound-mod=pygame
 exit $?