From 6079a65fb13d07f6c5a7fc2eed4f4002f109745f Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 17 Feb 2010 00:47:47 +0000
Subject: [PATCH 1/3] Initialize branch F-13 for PySolFC

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..baa94ef
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-13

From 05e490061e456f2cdba43b969e0f96df198c4b46 Mon Sep 17 00:00:00 2001
From: Stewart Adam <firewing@fedoraproject.org>
Date: Tue, 23 Feb 2010 04:48:25 +0000
Subject: [PATCH 2/3] - 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 | 11 +++++++++++
 PySolFC.spec               | 15 +++++++++++----
 pysol-start-script         |  2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 PySolFC-desktop-exec.patch

diff --git a/PySolFC-desktop-exec.patch b/PySolFC-desktop-exec.patch
new file mode 100644
index 0000000..849fd2a
--- /dev/null
+++ b/PySolFC-desktop-exec.patch
@@ -0,0 +1,11 @@
+--- 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;
diff --git a/PySolFC.spec b/PySolFC.spec
index aacc789..f9bc8c5 100644
--- a/PySolFC.spec
+++ b/PySolFC.spec
@@ -1,22 +1,23 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %define debug_package %{nil}
 
-%define cardsetversion 1.1
-
 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 +35,8 @@ written plug-ins, an integrated HTML help browser, and lots of documentation.
 
 %prep
 %setup -q
+%patch0 -p0 -b .desktop-exec
+
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -70,6 +73,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
 
diff --git a/pysol-start-script b/pysol-start-script
index a4e4b15..b0dbeb6 100644
--- a/pysol-start-script
+++ b/pysol-start-script
@@ -1,3 +1,3 @@
 #!/bin/sh
-/usr/share/PySolFC/pysol.py $*
+/usr/share/PySolFC/pysol.py "$@" --sound-mod=pygame
 exit $?

From 1da11c8fff40754d85b987e0d0a10c63cf778ac6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 09:13:07 +0000
Subject: [PATCH 3/3] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index aea1c86..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: PySolFC
-# $Id: Makefile,v 1.1 2007/10/23 00:27:35 tibbs Exp $
-NAME := PySolFC
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index baa94ef..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-13