- remove spurious edpendency, rel 3

[packages/PySolFC.git] / PySolFC.spec

diff --git a/PySolFC.spec b/PySolFC.spec
index 3a7fc8a73479d2c9392316722a60f589fd07bb87..ef20304b5148161e70f21626b5c53ebdb89dc113 100644 (file)
--- a/PySolFC.spec
+++ b/PySolFC.spec
@@ -1,25 +1,31 @@
+%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:       3
 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}
+Provides:      pysol-sound-server = %{version}-%{release}
+Obsoletes:     pysol < 5
+Obsoletes:     pysol-sound-server < 5
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -32,23 +38,21 @@ 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}
+%py3_install
 
-# sanitize
-mv $RPM_BUILD_ROOT%{_bindir}/pysol{.py,}
+cp -a PySolFC-Cardsets--Minimal-%{cardsets_minimal_ver}/cardset-* $RPM_BUILD_ROOT%{_datadir}/PySolFC
 
-%py_postclean
+# Not used in installed code
+%{__sed} -i '/pycotap/d' $RPM_BUILD_ROOT%{py3_sitescriptdir}/PySolFC-*.egg-info/requires.txt
 
 %find_lang pysol
 
@@ -57,48 +61,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 +75,5 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/themes
 %{_datadir}/%{name}/tiles
 
-%{_pixmapsdir}/*.xbm
-%{_pixmapsdir}/*.xpm
 %{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*x*/apps/pysol.png