rpms/gnome-games/devel gnome-games.spec,1.77,1.78

[fedora-cvs-commits at redhat.com]

Author: rstrode

Update of /cvs/dist/rpms/gnome-games/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14390

Modified Files:
	gnome-games.spec 
Log Message:
- Apply spec file patch from 
  Hooman Mesgary <hooman at farsiweb.info> to conditionallly
  compile out some of the games (bug 192001)



Index: gnome-games.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gnome-games.spec	10 May 2006 04:25:12 -0000	1.77
+++ gnome-games.spec	16 May 2006 19:26:38 -0000	1.78
@@ -1,5 +1,8 @@
 %define gettext_package gnome-games
 
+%define build_card 1
+%define build_tali 1
+
 %define glib2_version 2.6.0
 %define pango_version 1.8.0
 %define gtk2_version 2.6.0
@@ -11,7 +14,7 @@
 Summary: GNOME games
 Name: gnome-games
 Version: 2.15.1
-Release: 1
+Release: 2
 Epoch: 1
 License: LGPL
 Group: Amusements/Games
@@ -45,7 +48,6 @@
 
 The gnome-games package includes some small games that come with the
 GNOME desktop environment but can be used under any desktop.
-The games are mostly puzzle or solitaire games.
 
 %prep
 %setup -q
@@ -93,6 +95,40 @@
 rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/xbill.png
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gnometris.schemas
 
+%if ! %{build_card}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/blackjack
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/blackjack.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/blackjack
+rm -f $RPM_BUILD_ROOT%{_datadir}/omf/gnome-games/blackjack-C.omf
+rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/blackjack
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-blackjack.png
+rm -f $RPM_BUILD_ROOT%{_bindir}/blackjack
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/blackjack.schemas
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/sol-games
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/freecell.desktop
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/sol.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/aisleriot
+rm -f $RPM_BUILD_ROOT%{_datadir}/omf/gnome-games/aisleriot*
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-cardgame.png
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-aisleriot.png
+rm -f $RPM_BUILD_ROOT%{_bindir}/sol
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/aisleriot.schemas
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/cards
+rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-games-common/cards
+%endif
+
+%if ! %{build_tali}
+rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gtali.desktop
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/gtali
+rm -f $RPM_BUILD_ROOT%{_datadir}/omf/gnome-games/gtali*
+rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/gtali
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnome-gtali.png
+rm -f $RPM_BUILD_ROOT%{_bindir}/gtali
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gtali.schemas
+%endif
+
 ## things we just don't want in the package
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/libgdkcardimage.*a
@@ -110,13 +146,17 @@
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-glines.desktop \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnect.desktop
 
+%if %{build_card}
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-only-show-in GNOME                                  \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-freecell.desktop \
   $RPM_BUILD_ROOT%{_datadir}/applications/gnome-sol.desktop 
+%endif
 
+%if %{build_tali}
 perl -pi -e 's@<default></default>@<default>[Joe,Jim,James]</default>@g' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gtali.schemas
+%endif
 
 %find_lang %{gettext_package}
 
@@ -126,8 +166,22 @@
 %post
 scrollkeeper-update -q
 
+%if %{build_card}
+%define sol_schemas aisleriot.schemas
+%define bj_schemas blackjack.schemas
+%else
+%define sol_schemas %{nil}
+%define bj_schemas %{nil}
+%endif
+
+%if %{build_tali}
+%define gtali_schemas gtali.schemas
+%else
+%define gtali_schemas %{nil}
+%endif
+
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="aisleriot.schemas gataxx.schemas gnect.schemas gnobots2.schemas gnometris.schemas gnotravex.schemas iagno.schemas same-gnome.schemas blackjack.schemas glines.schemas gnibbles.schemas gnomine.schemas gtali.schemas mahjongg.schemas"
+SCHEMAS="%{sol_schemas} gataxx.schemas gnect.schemas gnobots2.schemas gnometris.schemas gnotravex.schemas iagno.schemas same-gnome.schemas %{bj_schemas} glines.schemas gnibbles.schemas gnomine.schemas %{gtali_schemas} mahjongg.schemas"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
@@ -156,8 +210,10 @@
 %{_datadir}/gnobots2
 %{_datadir}/sounds
 %{_datadir}/gnibbles
+%if %{build_card}
 %{_datadir}/sol-games
 %{_datadir}/blackjack
+%endif
 %{_datadir}/omf/gnome-games
 %{_datadir}/icons/hicolor/
 %{_sysconfdir}/gconf/schemas/*
@@ -166,8 +222,10 @@
 
 # these are not setgid games
 %{_bindir}/gnect
+%if %{build_card}
 %{_bindir}/blackjack
 %{_bindir}/sol
+%endif
 %{_bindir}/games-server.py
 %{_bindir}/games-server.pyc
 %{_bindir}/games-server.pyo
@@ -176,7 +234,9 @@
 %attr(2551, root, games) %{_bindir}/gnomine
 %attr(2551, root, games) %{_bindir}/same-gnome
 %attr(2551, root, games) %{_bindir}/mahjongg
+%if %{build_tali}
 %attr(2551, root, games) %{_bindir}/gtali
+%endif
 %attr(2551, root, games) %{_bindir}/gnobots2
 %attr(2551, root, games) %{_bindir}/gataxx
 %attr(2551, root, games) %{_bindir}/gnotravex
@@ -187,6 +247,11 @@
 
 
 %changelog
+* Tue May 16 2006 Ray Strode <rstrode at redhat.com> - 1:2.15.1-2
+- Apply spec file patch from 
+  Hooman Mesgary <hooman at farsiweb.info> to conditionallly
+  compile out some of the games (bug 192001)
+
 * Wed May 10 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.15.1-1
 - Update to 2.15.1