[gnome-games/f14/master] Attempt to disable swell-foop
Ray Strode
rstrode at fedoraproject.org
Fri Oct 1 18:33:52 UTC 2010
commit 0438adb6c6cd5e165adfa45fe82b4a13d512ffc8
Author: Ray Strode <rstrode at redhat.com>
Date: Fri Oct 1 14:30:46 2010 -0400
Attempt to disable swell-foop
It's causing problems since seed isn't working
well in f14.
(Bug 636118)
gnome-games.spec | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
---
diff --git a/gnome-games.spec b/gnome-games.spec
index 0d4f0b7..88eb066 100644
--- a/gnome-games.spec
+++ b/gnome-games.spec
@@ -4,6 +4,7 @@
%define build_card 1
%define build_tali 1
+%define build_seed_games 0
%if %{build_card}
%define card_schemas aisleriot.schemas
@@ -19,16 +20,22 @@
%define gtali_schemas %{nil}
%endif
+%if %{build_seed_games}
+%define omitted_seed_games swell-foop,lightsoff,
+%else
+%define omitted_seed_games %{nil}
+%endif
+
%if !%{build_card} && !%{build_tali}
-%define omitgames --enable-omitgames=aisleriot,gtali
+%define omitgames --enable-omitgames=%{omitted_seed_games}aisleriot,gtali
%else
%if !%{build_card}
-%define omitgames --enable-omitgames=aisleriot
+%define omitgames --enable-omitgames=%{omitted_seed_games}aisleriot
%else
%if !%{build_tali}
-%define omitgames --enable-omitgames=gtali
+%define omitgames --enable-omitgames=%{omitted_seed_games}gtali
%else
-%define omitgames --enable-omitgames=
+%define omitgames --enable-omitgames=%{omitted_seed_games}
%endif
%endif
%endif
@@ -44,7 +51,7 @@
Summary: Games for the GNOME desktop
Name: gnome-games
Version: 2.32.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GPLv3 and GFDL
Group: Amusements/Games
@@ -79,7 +86,9 @@ BuildRequires: expat-devel
BuildRequires: gstreamer-devel >= %{gstreamer_version}
BuildRequires: libcanberra-devel
BuildRequires: clutter-devel clutter-gtk-devel
+%if %{build_seed_games}
BuildRequires: seed-devel
+%endif
BuildRequires: intltool
# Newer than internal gettext needed
@@ -183,10 +192,12 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
(cd %{_sysconfdir}/gconf/schemas; \
gconftool-2 --makefile-install-rule \
%{card_schemas} \
+%if %{build_seed_games}
+ swell-foop.schemas \
+%endif
gnomine.schemas \
iagno.schemas \
gnome-sudoku.schemas \
- swell-foop.schemas \
> /dev/null || : )
touch %{_datadir}/icons/hicolor
@@ -309,7 +320,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/applications/gnome-gnomine.desktop
%{_datadir}/applications/gnome-iagno.desktop
%{_datadir}/applications/gnome-sudoku.desktop
+%if %{build_seed_games}
%{_datadir}/applications/gnome-swell-foop.desktop
+%endif
%dir %{_datadir}/gnome-games
%{_datadir}/gnome-games/aisleriot
@@ -318,7 +331,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/gnome-games/icons
%{_datadir}/gnome-games/sounds
%{_datadir}/gnome-games/pixmaps
+%if %{build_seed_games}
%{_datadir}/gnome-games/swell-foop
+%endif
%{_datadir}/gnome-games-common
%{_datadir}/gnome-sudoku
@@ -326,7 +341,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/*/apps/gnome-iagno.*
%{_datadir}/icons/hicolor/*/apps/gnome-mines.*
%{_datadir}/icons/hicolor/*/apps/gnome-sudoku.*
+%if %{build_seed_games}
%{_datadir}/icons/hicolor/*/apps/gnome-swell-foop.*
+%endif
%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnomine.*
@@ -341,12 +358,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_sysconfdir}/gconf/schemas/gnomine.schemas
%{_sysconfdir}/gconf/schemas/iagno.schemas
%{_sysconfdir}/gconf/schemas/gnome-sudoku.schemas
+%if %{build_seed_games}
%{_sysconfdir}/gconf/schemas/swell-foop.schemas
+%endif
# these are not setgid games
%{_bindir}/sol
%{_bindir}/gnome-sudoku
+%if %{build_seed_games}
%{_bindir}/swell-foop
+%endif
# these are setgid games
%attr(2551, root, games) %{_bindir}/iagno
@@ -450,6 +471,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Oct 01 2010 Ray Strode <rstrode at redhat.com> 2.32.0-3
+- Temporarily disable seed games
+ Resolves: #636118
+
* Fri Oct 01 2010 Jesse Keating <jkeating at redhat.com> - 2.32.0-2
- Add missing dep in -extra RHBZ 639130
More information about the scm-commits
mailing list