dist-git conversion

- Force pygame as sound mod, makes PySolFC work with PulseAudio

.cvsignore

@@ -1 +0,0 @@
-PySolFC-1.1.tar.bz2

.gitignore

@@ -0,0 +1 @@
+PySolFC-2.0.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: PySolFC
-# $Id$
-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 $$/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)

PySol.desktop

@@ -1,95 +0,0 @@
-[Desktop Entry]
-GenericName=Card Games
-GenericName[af]=Kaart Speletjie
-GenericName[ar]=لعبة ورق
-GenericName[az]=Kart Oyunu
-GenericName[be]=Картачная гульня
-GenericName[bg]=Игра с карти
-GenericName[bn]=তাসের খেলা
-GenericName[br]=C'hoari kartennoù
-GenericName[bs]=Igra s kartama
-GenericName[ca]=Joc de cartes
-GenericName[cs]=Karty
-GenericName[cy]=Gêm cardiau
-GenericName[da]=Kortspil
-GenericName[de]=Kartenspiel
-GenericName[el]=Παιχνίδι καρτών
-GenericName[eo]=Kartludo
-GenericName[es]=Juego de cartas
-GenericName[et]=Kaardimäng
-GenericName[eu]=Karta jokoa
-GenericName[fa]=کارت بازی
-GenericName[fi]=Korttipeli
-GenericName[fo]=Kortspøl
-GenericName[fr]=Jeu de cartes
-GenericName[fy]=Kaartspul
-GenericName[ga]=Cluiche Cártaí
-GenericName[gl]=Xogo de Cartas
-GenericName[he]=משחק קלפים
-GenericName[hi]=ताश के खेल
-GenericName[hr]=Kartaška igra
-GenericName[hsb]=Kartowa hra
-GenericName[hu]=Kártyajáték
-GenericName[is]=Kaplar
-GenericName[it]=Gioco di carte
-GenericName[ja]=カードゲーム
-GenericName[km]=ល្បែង​បៀរ
-GenericName[ko]=카드 놀이
-GenericName[lo]=ເກມໄພ້
-GenericName[lt]=Kortų žaidimas
-GenericName[lv]=Kāršu Spēle
-GenericName[mk]=Игра со карти
-GenericName[mn]=Хөзрийн тоглоом
-GenericName[ms]=Permainan Kad
-GenericName[mt]=Logħba tal-karti
-GenericName[nb]=Kortspill
-GenericName[nds]=Koortspeel
-GenericName[nl]=Kaartspel
-GenericName[nn]=Kortspel
-GenericName[nso]=Papadi ya Dikarata
-GenericName[pa]=ਤਾਸ਼ ਖੇਡ
-GenericName[pl]=Gra karciana
-GenericName[pt]=Jogo de Cartas
-GenericName[pt_BR]=Cartas
-GenericName[ro]=Joc de cărţi
-GenericName[ru]=Карточная игра
-GenericName[rw]=Umukino Ikarika
-GenericName[se]=Goartaspeallu
-GenericName[sk]=Kartová hra
-GenericName[sl]=Igra s kartami
-GenericName[sr]=Игра са картама
-GenericName[sr@Latn]=Igra sa kartama
-GenericName[ss]=Umdlalo welikhadi
-GenericName[sv]=Kortspel
-GenericName[ta]=கார்டு விளையாட்டு
-GenericName[tg]=Бозии Корт
-GenericName[th]=เกมไพ่
-GenericName[tr]=İskambil Oyunu
-GenericName[tt]=Kard Uyını
-GenericName[uk]=Карти
-GenericName[uz]=Қарта ўйини
-GenericName[ven]=Garata ya mutambo
-GenericName[vi]=Game thẻ
-GenericName[wa]=Cwårdjeu
-GenericName[xh]=Umdlalo Wekhadi
-GenericName[zh_CN]=牌类游戏
-GenericName[zh_TW]=紙牌遊戲
-GenericName[zu]=Umdlalo Wamakhadi
-Name=PySol
-Name[af]=Pysol
-Name[ar]=بايسول
-Name[bn]=পাই-সল
-Name[eo]=Soliterego
-Name[fa]=پایسول
-Name[hi]=पायसॉल
-Name[ko]=파이솔
-Name[lo]=Pysol
-Name[sv]=Pysol
-Name[th]=เกมถอดไพ่ PySol
-Name[vi]=PySol
-Exec=pysol
-Icon=pysol
-Terminal=false
-Type=Application
-Categories=Game;CardGame;
-Version=1.0

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;

PySolFC.spec

@@ -1,24 +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:        1.1
+Version:        2.0
-Release:        8%{?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.desktop
+Source1:        pysol-start-script
-Source2:        pysol-start-script
+Patch0:         PySolFC-desktop-exec.patch
-Patch0:         pysolfc-setup.py-noglade.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
@@ -36,7 +35,7 @@ written plug-ins, an integrated HTML help browser, and lots of documentation.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p0 -b .desktop-exec
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -45,13 +44,13 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 # install desktop file
-desktop-file-install --vendor="fedora" \
+desktop-file-install --vendor="fedora" --delete-original \
     --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
-    %{SOURCE1}
+    $RPM_BUILD_ROOT/%{_datadir}/applications/pysol.desktop
 
 # install the startup wrapper
 mv $RPM_BUILD_ROOT%{_bindir}/pysol.py $RPM_BUILD_ROOT%{_datadir}/%{name}
-install -m755 %{SOURCE2} $RPM_BUILD_ROOT/%{_bindir}/pysol
+install -m755 %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/pysol
 
 %find_lang pysol
 
@@ -68,10 +67,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/pysol
 %{_datadir}/%{name}/*
 %{_datadir}/pixmaps/*
+%{_datadir}/icons/*.png
 %{_datadir}/applications/fedora-*.desktop
 
 
 %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
+
+* Sat Jan 30 2010 Stewart Adam <s.adam at diffingo.com> - 2.0-1
+- Update to 2.0
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

pysol-start-script

@@ -1,3 +1,3 @@
 #!/bin/sh
-/usr/share/PySolFC/pysol.py $*
+/usr/share/PySolFC/pysol.py "$@" --sound-mod=pygame
 exit $?

pysolfc-setup.py-noglade.patch

@@ -1,11 +0,0 @@
---- setup.py.orig	2007-09-29 16:41:41.000000000 -0400
-+++ setup.py	2007-09-29 16:41:49.000000000 -0400
-@@ -44,7 +44,7 @@
-     for l in ('ru', 'ru_RU'):
-         data_files.append(('share/locale/%s/LC_MESSAGES' % l,
-                            ['locale/%s/LC_MESSAGES/pysol.mo' % l]))
--    data_files.append((data_dir, ['data/pysolfc.glade']))
-+    #data_files.append((data_dir, ['data/pysolfc.glade']))
- 
- ##from pprint import pprint; pprint(data_files)
- ##import sys; sys.exit()

sources

@@ -1 +1 @@
-56aca8101b3534aaf3564c40ed6824f1  PySolFC-1.1.tar.bz2
+f9ee647947924efdf1d24af179d3cc0a  PySolFC-2.0.tar.bz2