rpms/gnome-games/devel gnome-games.spec,1.239,1.240

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-games/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9506

Modified Files:
	gnome-games.spec 
Log Message:
blackjack was removed too


Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -p -r1.239 -r1.240
--- gnome-games.spec	2 Dec 2009 11:14:21 -0000	1.239
+++ gnome-games.spec	2 Dec 2009 11:47:55 -0000	1.240
@@ -7,11 +7,9 @@
 
 %if %{build_card}
 %define card_schemas aisleriot.schemas
-%define card_schemas_extra blackjack.schemas
 %define card_desktops $RPM_BUILD_ROOT%{_datadir}/applications/gnome-sol.desktop $RPM_BUILD_ROOT%{_datadir}/applications/gnome-freecell.desktop
 %else
 %define card_schemas %{nil}
-%define card_schemas_extra %{nil}
 %define card_desktops %{nil}
 %endif
 
@@ -22,10 +20,10 @@
 %endif
 
 %if !%{build_card} && !%{build_tali}
-%define omitgames --enable-omitgames=aisleriot,blackjack,gtali
+%define omitgames --enable-omitgames=aisleriot,gtali
 %else
 %if !%{build_card}
-%define omitgames --enable-omitgames=aisleriot,blackjack
+%define omitgames --enable-omitgames=aisleriot
 %else
 %if !%{build_tali}
 %define omitgames --enable-omitgames=gtali
@@ -206,7 +204,6 @@ fi
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 (cd %{_sysconfdir}/gconf/schemas;   \
 gconftool-2 --makefile-install-rule \
-	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
 	glchess.schemas             \
 	glines.schemas              \
@@ -244,8 +241,8 @@ if [ "$1" -gt 1 ]; then
   (cd %{_sysconfdir}/gconf/schemas;   \
   if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; done ; \
   if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; done ; \
+  if test -f blackjack.schemas ; then gconftool-2 --makefile-uninstall-rule blackjack.schemas ; done ; \
   gconftool-2 --makefile-uninstall-rule \
-	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
 	glchess.schemas             \
 	glines.schemas              \
@@ -282,8 +279,8 @@ if [ "$1" -eq 0 ]; then
   (cd %{_sysconfdir}/gconf/schemas;   \
   if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; done ; \
   if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; done ; \
+  if test -f blackjack.schemas ; then gconftool-2 --makefile-uninstall-rule blackjack.schemas ; done ; \
   gconftool-2 --makefile-uninstall-rule \
-	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
 	glchess.schemas             \
 	glines.schemas              \
@@ -381,7 +378,6 @@ fi
 %{python_sitelib}/glchess
 %{_datadir}/glchess
 
-%{_datadir}/applications/gnome-blackjack.desktop
 %{_datadir}/applications/gnome-freecell.desktop
 %{_datadir}/applications/gnome-glchess.desktop
 %{_datadir}/applications/gnome-glines.desktop
@@ -392,9 +388,8 @@ fi
 %{_datadir}/applications/gnome-gnotski.desktop
 %{_datadir}/applications/gnome-gtali.desktop
 %{_datadir}/applications/gnome-mahjongg.desktop
-%{_datadir}/applications/quadrapassel.desktop
+%{_datadir}/applications/gnome-quadrapassel.desktop
 
-%{_mandir}/man6/blackjack.6.gz
 %{_mandir}/man6/glchess.6.gz
 %{_mandir}/man6/glines.6.gz
 %{_mandir}/man6/gnect.6.gz
@@ -418,9 +413,6 @@ fi
 
 # these are not setgid games
 %{_bindir}/gnect
-%if %{build_card}
-%{_bindir}/blackjack
-%endif
 %{_bindir}/glchess
 
 # these are setgid games
@@ -429,16 +421,13 @@ fi
 %attr(2551, root, games) %{_bindir}/gtali
 %endif
 %attr(2551, root, games) %{_bindir}/gnobots2
-%attr(2551, root, games) %{_bindir}/gnome-falling-blocks
+%attr(2551, root, games) %{_bindir}/gnome-quadrapassel
 %attr(2551, root, games) %{_bindir}/gnotravex
 %attr(2551, root, games) %{_bindir}/gnotski
 %attr(2551, root, games) %{_bindir}/gnibbles
 %attr(2551, root, games) %{_bindir}/glines
 
 # gconf schemas
-%if %{build_card}
-%{_sysconfdir}/gconf/schemas/blackjack.schemas
-%endif
 %{_sysconfdir}/gconf/schemas/glines.schemas
 %{_sysconfdir}/gconf/schemas/gnect.schemas
 %{_sysconfdir}/gconf/schemas/gnibbles.schemas
@@ -452,7 +441,6 @@ fi
 %{_sysconfdir}/gconf/schemas/mahjongg.schemas
 %{_sysconfdir}/gconf/schemas/glchess.schemas
 
-%{_datadir}/gnome-games/blackjack
 %{_datadir}/gnome-games/glines
 %{_datadir}/gnome-games/gnect
 %{_datadir}/gnome-games/gnibbles
@@ -462,13 +450,13 @@ fi
 %{_datadir}/gnome-games/mahjongg
 %{_datadir}/gnome-games/gnotski
 
-%{_datadir}/icons/hicolor/*/apps/gnome-blackjack.*
 %{_datadir}/icons/hicolor/*/apps/gnome-freecell.*
 %{_datadir}/icons/hicolor/*/apps/gnome-glchess.*
 %{_datadir}/icons/hicolor/*/apps/gnome-glines.*
 %{_datadir}/icons/hicolor/*/apps/gnome-gnect.*
 %{_datadir}/icons/hicolor/*/apps/gnome-gnibbles.*
-%{_datadir}/icons/hicolor/*/apps/gnome-quadrapassel.*
+# %{_datadir}/icons/hicolor/*/apps/gnome-quadrapassel.*
+%{_datadir}/icons/hicolor/*/apps/gnome-gnometris.*
 %{_datadir}/icons/hicolor/*/apps/gnome-klotski.*
 %{_datadir}/icons/hicolor/*/apps/gnome-mahjongg.*
 %{_datadir}/icons/hicolor/*/apps/gnome-robots.*