- up to 2.20.1

diff --git a/PySol.desktop b/PySol.desktop
deleted file mode 100644 (file)
index 59feb9e..0000000
--- a/PySol.desktop
+++ /dev/null
@@ -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

diff --git a/PySolFC.spec b/PySolFC.spec
index 3a7fc8a73479d2c9392316722a60f589fd07bb87..c60743f91c90661087c735ff8ff929897e47b47c 100644 (file)
--- a/PySolFC.spec
+++ b/PySolFC.spec
@@ -1,25 +1,29 @@
+%define                cardsets_minimal_ver    2.2.0
+
 Summary:       A collection of solitare card games
 Name:          PySolFC
-Version:       1.1
-Release:       0.3
+Version:       2.20.1
+Release:       1
 License:       GPL v2+
 Group:         Applications/Games
 URL:           http://pysolfc.sourceforge.net/
-Source0:       http://downloads.sourceforge.net/pysolfc/%{name}-%{version}.tar.bz2
-# Source0-md5: 56aca8101b3534aaf3564c40ed6824f1
-Source1:       PySol.desktop
+Source0:       http://downloads.sourceforge.net/pysolfc/%{name}-%{version}.tar.xz
+# Source0-md5: d913fdaeeb3d736701fd7684652c0a5f
+Source1:       https://downloads.sourceforge.net/pysolfc/PySolFC-Cardsets--Minimal-%{cardsets_minimal_ver}.tar.xz
+# Source1-md5: 74ce380505393a5538b25cccb2ea1682
 Patch0:                pysolfc-setup.py-noglade.patch
-BuildRequires: python-devel
-BuildRequires: python-modules
+BuildRequires: python3-devel
+BuildRequires: python3-modules
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.710
-Requires:      python-PIL-tk
-Requires:      python-modules
-Requires:      python-tkinter
+Requires:      python3-modules
+Requires:      python3-pillow-tk
+Requires:      python3-tkinter
 Requires:      tcl
 Requires:      tix
 Requires:      tk
 Provides:      pysol = %{version}-%{release}
+Obsoletes:     pysol < 5
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,23 +36,18 @@ system, demo games, a solitaire wizard, support for user written
 plug-ins, an integrated HTML help browser, and lots of documentation.
 
 %prep
-%setup -q
+%setup -q -a1
 %patch0 -p0
 
 %build
-%py_build
+%py3_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_desktopdir}
-%py_install
-
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
-# sanitize
-mv $RPM_BUILD_ROOT%{_bindir}/pysol{.py,}
+%py3_install
 
-%py_postclean
+cp -a PySolFC-Cardsets--Minimal-%{cardsets_minimal_ver}/cardset-* $RPM_BUILD_ROOT%{_datadir}/PySolFC
 
 %find_lang pysol
 
@@ -57,48 +56,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f pysol.lang
 %defattr(644,root,root,755)
-%doc README PKG-INFO
-%attr(755,root,root) %{_bindir}/pysol
-%dir %{py_sitescriptdir}/pysollib
-%{py_sitescriptdir}/pysollib/*.py[co]
-%dir %{py_sitescriptdir}/pysollib/configobj
-%{py_sitescriptdir}/pysollib/configobj/*.py[co]
-%dir %{py_sitescriptdir}/pysollib/games
-%{py_sitescriptdir}/pysollib/games/*.py[co]
-%dir %{py_sitescriptdir}/pysollib/games/mahjongg
-%{py_sitescriptdir}/pysollib/games/mahjongg/*.py[co]
-%dir %{py_sitescriptdir}/pysollib/games/special
-%{py_sitescriptdir}/pysollib/games/special/*.py[co]
-%dir %{py_sitescriptdir}/pysollib/games/ultra
-%{py_sitescriptdir}/pysollib/games/ultra/*.py[co]
-%dir %{py_sitescriptdir}/pysollib/macosx
-%{py_sitescriptdir}/pysollib/macosx/*.py[co]
-%dir %{py_sitescriptdir}/pysollib/pysolgtk
-%{py_sitescriptdir}/pysollib/pysolgtk/*.py[co]
-%dir %{py_sitescriptdir}/pysollib/tile
-%{py_sitescriptdir}/pysollib/tile/*.py[co]
-%dir %{py_sitescriptdir}/pysollib/tk
-%{py_sitescriptdir}/pysollib/tk/*.py[co]
-%dir %{py_sitescriptdir}/pysollib/winsystems
-%{py_sitescriptdir}/pysollib/winsystems/*.py[co]
-
-%if "%{py_ver}" > "2.4"
-%{py_sitescriptdir}/PySolFC-*.egg-info
-%endif
+%doc AUTHORS.md NEWS.asciidoc README.md
+%attr(755,root,root) %{_bindir}/pysol.py
+%{py3_sitescriptdir}/pysollib
+%{py3_sitescriptdir}/PySolFC-*.egg-info
 
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/cardset-crystal-mahjongg
-%{_datadir}/%{name}/cardset-dashavatara-ganjifa
-%{_datadir}/%{name}/cardset-dondorf
-%{_datadir}/%{name}/cardset-gnome-mahjongg-1
-%{_datadir}/%{name}/cardset-hexadeck
-%{_datadir}/%{name}/cardset-kintengu
-%{_datadir}/%{name}/cardset-matrix
-%{_datadir}/%{name}/cardset-mughal-ganjifa
-%{_datadir}/%{name}/cardset-oxymoron
-%{_datadir}/%{name}/cardset-standard
-%{_datadir}/%{name}/cardset-tuxedo
-%{_datadir}/%{name}/cardset-vienna-2k
+%{_datadir}/%{name}/cardset-*
 %{_datadir}/%{name}/html
 %{_datadir}/%{name}/images
 %{_datadir}/%{name}/sound
@@ -106,6 +70,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/themes
 %{_datadir}/%{name}/tiles
 
-%{_pixmapsdir}/*.xbm
-%{_pixmapsdir}/*.xpm
 %{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*x*/apps/pysol.png

diff --git a/pysolfc-setup.py-noglade.patch b/pysolfc-setup.py-noglade.patch
index d8af5963a690a44e67fe64d84c022f04bac498ab..67d210b1460a0e1297ef94db874c35a41da1e938 100644 (file)
--- a/pysolfc-setup.py-noglade.patch
+++ b/pysolfc-setup.py-noglade.patch
@@ -1,11 +1,11 @@
 --- 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]))
+     for size in os.listdir('data/images/icons'):
+         data_files.append(('share/icons/hicolor/%s/apps' % size,
+                            ['data/images/icons/%s/pysol.png' % size]))
 -    data_files.append((data_dir, ['data/pysolfc.glade']))
 +    #data_files.append((data_dir, ['data/pysolfc.glade']))
+     data_files.append(('share/applications', ['data/pysol.desktop']))
  
- ##from pprint import pprint; pprint(data_files)
- ##import sys; sys.exit()
+ # from pprint import pprint; pprint(data_files)