rpms/gnome-games/devel gnome-games.spec,1.222,1.223

Matthias Clasen mclasen at fedoraproject.org
Fri Jul 31 15:07:09 UTC 2009 

Author: mclasen

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

Modified Files:
	gnome-games.spec 
Log Message:
Split off some games to include in the live cd



Index: gnome-games.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- gnome-games.spec	30 Jul 2009 13:18:44 -0000	1.222
+++ gnome-games.spec	31 Jul 2009 15:07:08 -0000	1.223
@@ -6,10 +6,12 @@
 %define build_tali 1
 
 %if %{build_card}
-%define card_schemas aisleriot.schemas blackjack.schemas
-%define card_desktops $RPM_BUILD_ROOT%{_datadir}/applications/gnome-freecell.desktop $RPM_BUILD_ROOT%{_datadir}/applications/gnome-sol.desktop
+%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
 
@@ -44,7 +46,7 @@
 Summary: Games for the GNOME desktop
 Name: gnome-games
 Version: 2.27.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 Group: Amusements/Games
@@ -59,8 +61,6 @@ BuildRoot:  %{_tmppath}/%{name}-%{versio
 Obsoletes: gnome-games-devel
 URL: http://projects.gnome.org/gnome-games/
 
-Requires(post): scrollkeeper >= 0.1.4
-Requires(postun): scrollkeeper >= 0.1.4
 Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -84,7 +84,6 @@ BuildRequires: pygtk2-devel
 BuildRequires: gnome-python2-desktop >= %{gnome_python_desktop}
 BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: scrollkeeper
 BuildRequires: librsvg2-devel
 BuildRequires: guile-devel >= 1.6.5
 BuildRequires: expat-devel
@@ -114,6 +113,17 @@ Obsoletes: glchess < 2.0
 The gnome-games package is a collection of some small "five-minute" games
 in a variety of styles and genres for the GNOME desktop.
 
+
+%package extra
+Group: Amusements/Games
+Summary: More games for the GNOME desktop
+Requires: %{name} = %{epoch}%{version}-%{release}
+
+%description extra
+The gnome-games-extra package contains additional small "five-minute" games
+in a variety of styles and genres for the GNOME desktop.
+
+
 %package help
 Group: Applications/Productivity
 Summary: Help files for %{name}
@@ -210,12 +220,28 @@ grep -v "/usr/share/locale" %{gettext_pa
 rm -rf $RPM_BUILD_ROOT
 
 %post
-scrollkeeper-update -q
-
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 (cd %{_sysconfdir}/gconf/schemas;   \
 gconftool-2 --makefile-install-rule \
 	%{card_schemas}             \
+	gnomine.schemas             \
+	iagno.schemas               \
+	same-gnome.schemas          \
+	gnome-sudoku.schemas	    \
+> /dev/null || : )
+
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+ggz-config -i -f -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
+
+%post extra
+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              \
@@ -223,13 +249,9 @@ gconftool-2 --makefile-install-rule \
 	gnibbles.schemas            \
 	gnobots2.schemas            \
 	gnometris.schemas           \
-	gnomine.schemas             \
 	gnotravex.schemas           \
 	gnotski.schemas             \
-	iagno.schemas               \
 	mahjongg.schemas            \
-	same-gnome.schemas          \
-	gnome-sudoku.schemas	    \
 > /dev/null || : )
 
 touch %{_datadir}/icons/hicolor
@@ -239,7 +261,6 @@ fi
 
 ggz-config -i -f -m %{_datadir}/ggz/gnect-client.dsc >& /dev/null || :
 ggz-config -i -f -m %{_datadir}/ggz/gnibbles-client.dsc >& /dev/null || :
-ggz-config -i -f -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -247,6 +268,19 @@ if [ "$1" -gt 1 ]; then
   (cd %{_sysconfdir}/gconf/schemas;   \
   gconftool-2 --makefile-uninstall-rule \
 	%{card_schemas}             \
+	gnomine.schemas             \
+	iagno.schemas               \
+	same-gnome.schemas          \
+	gnome-sudoku.schemas	    \
+> /dev/null || : )
+fi
+
+%pre extra
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  (cd %{_sysconfdir}/gconf/schemas;   \
+  gconftool-2 --makefile-uninstall-rule \
+	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
 	glchess.schemas             \
 	glines.schemas              \
@@ -254,12 +288,9 @@ if [ "$1" -gt 1 ]; then
 	gnibbles.schemas            \
 	gnobots2.schemas            \
 	gnometris.schemas           \
-	gnomine.schemas             \
 	gnotravex.schemas           \
 	gnotski.schemas             \
-	iagno.schemas               \
 	mahjongg.schemas            \
-	same-gnome.schemas          \
 > /dev/null || : )
 fi
 
@@ -269,6 +300,21 @@ if [ "$1" -eq 0 ]; then
   (cd %{_sysconfdir}/gconf/schemas;   \
   gconftool-2 --makefile-uninstall-rule \
 	%{card_schemas}             \
+	gnomine.schemas             \
+	iagno.schemas               \
+	same-gnome.schemas          \
+	gnome-sudoku.schemas	    \
+> /dev/null || : )
+
+  ggz-config -r -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
+fi
+
+%preun extra
+if [ "$1" -eq 0 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  (cd %{_sysconfdir}/gconf/schemas;   \
+  gconftool-2 --makefile-uninstall-rule \
+	%{card_schemas_extra}       \
 	%{gtali_schemas}            \
 	glchess.schemas             \
 	glines.schemas              \
@@ -276,79 +322,121 @@ if [ "$1" -eq 0 ]; then
 	gnibbles.schemas            \
 	gnobots2.schemas            \
 	gnometris.schemas           \
-	gnomine.schemas             \
 	gnotravex.schemas           \
 	gnotski.schemas             \
-	iagno.schemas               \
 	mahjongg.schemas            \
-	same-gnome.schemas          \
-	gnome-sudoku.schemas	    \
 > /dev/null || : )
 
   ggz-config -r -m %{_datadir}/ggz/gnect-client.dsc >& /dev/null || :
   ggz-config -r -m %{_datadir}/ggz/gnibbles-client.dsc >& /dev/null || :
-  ggz-config -r -m %{_datadir}/ggz/iagno-client.dsc >& /dev/null || :
 fi
 
 %postun
-scrollkeeper-update -q
 touch %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
 
+%postun extra
+touch %{_datadir}/icons/hicolor
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+
+%files help -f help.lang
+
 %files -f translations.lang
 %defattr(-, root, root)
 %doc AUTHORS COPYING README
-%{_datadir}/applications/*
-%{_datadir}/gnome-games
+%{_datadir}/applications/gnome-sol.desktop
+%{_datadir}/applications/gnome-gnomine.desktop
+%{_datadir}/applications/gnome-iagno.desktop
+%{_datadir}/applications/gnome-same-gnome.desktop
+%{_datadir}/applications/gnome-sudoku.desktop
+
+%dir %{_datadir}/gnome-games
+%{_datadir}/gnome-games/aisleriot
+%{_datadir}/gnome-games/gnomine
+%{_datadir}/gnome-games/iagno
+%{_datadir}/gnome-games/same-gnome
+%{_datadir}/gnome-games/icons
+%{_datadir}/gnome-games/sounds
+%{_datadir}/gnome-games/pixmaps
 %{_datadir}/gnome-games-common
-%{_datadir}/glchess
 %{_datadir}/gnome-sudoku
-%{_datadir}/icons/hicolor/*/*/*
-%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/*
+
+%{_datadir}/icons/hicolor/*/apps/gnome-aisleriot.*
+%{_datadir}/icons/hicolor/*/apps/gnome-iagno.*
+%{_datadir}/icons/hicolor/*/apps/gnome-mines.*
+%{_datadir}/icons/hicolor/*/apps/gnome-samegnome.*
+%{_datadir}/icons/hicolor/*/apps/gnome-sudoku.*
+
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/same-gnome.*
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnomine.*
 
 %{_libdir}/gnome-games
 
-%{python_sitelib}/glchess
 %{python_sitelib}/gnome_sudoku
 
 # gconf schemas
 %if %{build_card}
 %{_sysconfdir}/gconf/schemas/aisleriot.schemas
-%{_sysconfdir}/gconf/schemas/blackjack.schemas
 %endif
-%{_sysconfdir}/gconf/schemas/glines.schemas
-%{_sysconfdir}/gconf/schemas/gnect.schemas
-%{_sysconfdir}/gconf/schemas/gnibbles.schemas
-%{_sysconfdir}/gconf/schemas/gnobots2.schemas
-%{_sysconfdir}/gconf/schemas/gnometris.schemas
 %{_sysconfdir}/gconf/schemas/gnomine.schemas
-%{_sysconfdir}/gconf/schemas/gnotravex.schemas
-%{_sysconfdir}/gconf/schemas/gnotski.schemas
-%if %{build_tali}
-%{_sysconfdir}/gconf/schemas/gtali.schemas
-%endif
 %{_sysconfdir}/gconf/schemas/iagno.schemas
-%{_sysconfdir}/gconf/schemas/mahjongg.schemas
 %{_sysconfdir}/gconf/schemas/same-gnome.schemas
-%{_sysconfdir}/gconf/schemas/glchess.schemas
 %{_sysconfdir}/gconf/schemas/gnome-sudoku.schemas
 
+%{_datadir}/ggz/gnome-games
+%{_datadir}/ggz/iagno-client.dsc
+
+# these are not setgid games
+%{_bindir}/sol
+%{_bindir}/gnome-sudoku
+
+# these are setgid games
+%attr(2551, root, games) %{_bindir}/same-gnome
+%attr(2551, root, games) %{_bindir}/iagno
+%attr(2551, root, games) %{_bindir}/gnomine
+
+
+%files extra 
+%defattr(-, root, root)
+
+%{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
+%{_datadir}/applications/gnome-gnect.desktop
+%{_datadir}/applications/gnome-gnibbles.desktop
+%{_datadir}/applications/gnome-gnobots2.desktop
+%{_datadir}/applications/gnome-gnotravex.desktop
+%{_datadir}/applications/gnome-gnotski.desktop
+%{_datadir}/applications/gnome-gtali.desktop
+%{_datadir}/applications/gnome-mahjongg.desktop
+%{_datadir}/applications/gnometris.desktop
+
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/glines.*
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnibbles.*
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnobots2.*
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnometris.*
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnotravex.*
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnotski.*
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gtali.*
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/mahjongg.*
+
+
 # these are not setgid games
 %{_bindir}/gnect
 %if %{build_card}
 %{_bindir}/blackjack
-%{_bindir}/sol
 %endif
 %{_bindir}/glchess
-%{_bindir}/gnome-sudoku
-
-%{_datadir}/ggz/*
 
 # these are setgid games
-%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
@@ -359,11 +447,55 @@ fi
 %attr(2551, root, games) %{_bindir}/gnotski
 %attr(2551, root, games) %{_bindir}/gnibbles
 %attr(2551, root, games) %{_bindir}/glines
-%attr(2551, root, games) %{_bindir}/iagno
 
-%files help -f help.lang
+# 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
+%{_sysconfdir}/gconf/schemas/gnobots2.schemas
+%{_sysconfdir}/gconf/schemas/gnometris.schemas
+%{_sysconfdir}/gconf/schemas/gnotravex.schemas
+%{_sysconfdir}/gconf/schemas/gnotski.schemas
+%if %{build_tali}
+%{_sysconfdir}/gconf/schemas/gtali.schemas
+%endif
+%{_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
+%{_datadir}/gnome-games/gnobots2
+%{_datadir}/gnome-games/gnometris
+%{_datadir}/gnome-games/gtali
+%{_datadir}/gnome-games/mahjongg
+%{_datadir}/gnome-games/gnotski
+
+%{_datadir}/ggz/gnect-client.dsc
+%{_datadir}/ggz/gnibbles-client.dsc
+
+%{_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-gnometris.*
+%{_datadir}/icons/hicolor/*/apps/gnome-klotski.*
+%{_datadir}/icons/hicolor/*/apps/gnome-mahjongg.*
+%{_datadir}/icons/hicolor/*/apps/gnome-robots.*
+%{_datadir}/icons/hicolor/*/apps/gnome-tali.*
+%{_datadir}/icons/hicolor/*/apps/gnome-tetravex.*
+
 
 %changelog
+* Fri Jul 31 2009 Matthias Clasen <mclasen at redhat.com> 2.27.5-3
+- Split off a subset of games to include on the live cd
+
 * Thu Jul 30 2009 Bastien Nocera <bnocera at redhat.com> 2.27.5-2
 - Rebuild for new clutter-gtk and clutter

More information about the fedora-extras-commits mailing list