[gnome-games/f15/master] 3.0.1

[Christopher Aillon]

commit 4668114225fd5bb2a87454f3e6348ac1011cfafd
Author: Christopher Aillon <caillon at redhat.com>
Date:   Mon Apr 18 18:09:09 2011 -0700

    3.0.1

 gnome-games.spec |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)
---
diff --git a/gnome-games.spec b/gnome-games.spec
index 6545325..6b9282c 100644
--- a/gnome-games.spec
+++ b/gnome-games.spec
@@ -4,7 +4,7 @@
 
 %define build_card 1
 %define build_tali 1
-%define build_seed_games 0
+%define build_seed_games 1
 %define have_sudoku 0
 
 %if %{build_card}
@@ -23,8 +23,12 @@
 
 %if %{build_seed_games}
 %define omitted_seed_games %{nil}
+%define swell_foop swell-foop
+%define lightsoff lightsoff
 %else
 %define omitted_seed_games swell-foop,lightsoff,
+%define swell_foop %{nil}
+%define lightsoff %{nil}
 %endif
 
 %if !%{build_card} && !%{build_tali}
@@ -56,8 +60,8 @@
 
 Summary: Games for the GNOME desktop
 Name: gnome-games
-Version: 3.0.0
-Release: 3%{?dist}
+Version: 3.0.1
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+ and GPLv3 and GFDL
 Group: Amusements/Games
@@ -202,10 +206,8 @@ rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/lightsoff.schemas
         $RPM_BUILD_ROOT%{_datadir}/applications/gnome-lightsoff.desktop         \
         $RPM_BUILD_ROOT%{_datadir}/gnome-games/lightsoff/                       \
         $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gnome-lightsoff.svg
-
-# remove .la files
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-games/libgames-support-gi.la
 %endif
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-games/libgames-support-gi.{l,}a
 
 %find_lang %{gettext_package} --all-name --with-gnome
 grep "/usr/share/locale" %{gettext_package}.lang > translations.lang
@@ -216,26 +218,26 @@ grep -v "/sr at latin/figures" help-tmp.lang > help.lang
 
 
 %post
-%gconf_schema_upgrade %{card} gnomine iagno %{sudoku}
+%gconf_schema_upgrade %{card} gnomine iagno %{sudoku} %{swell_foop}
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %post extra
-%gconf_schema_upgrade %{gtali} glines gnect gnibbles gnobots2 gnotravex gnotski mahjongg quadrapassel
+%gconf_schema_upgrade %{gtali} glines gnect gnibbles gnobots2 gnotravex gnotski %{lightsoff} mahjongg quadrapassel
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %pre
-%gconf_schema_prepare %{card} gnomine iagno %{sudoku}
-%gconf_schema_obsolete same-gnome swell-foop
+%gconf_schema_prepare %{card} gnomine iagno %{sudoku} %{swell_foop}
+%gconf_schema_obsolete same-gnome
 
 %pre extra
-%gconf_schema_prepare %{gtali} glines gnect gnibbles gnobots2 gnotravex gnotski mahjongg quadrapassel
+%gconf_schema_prepare %{gtali} glines gnect gnibbles gnobots2 gnotravex gnotski %{lightsoff} mahjongg quadrapassel
 %gconf_schema_obsolete blackjack glchess gnometris
 
 %preun
-%gconf_schema_remove %{card} gnomine iagno %{sudoku}
+%gconf_schema_remove %{card} gnomine iagno %{sudoku} %{swell_foop}
 
 %preun extra
-%gconf_schema_remove %{gtali} glines gnect gnibbles gnobots2 gnotravex gnotski mahjongg quadrapassel
+%gconf_schema_remove %{gtali} glines gnect gnibbles gnobots2 gnotravex gnotski %{lightsoff} mahjongg quadrapassel
 
 %postun
 if [ $1 -eq 0 ]; then
@@ -266,7 +268,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %defattr(-, root, root)
 %doc AUTHORS COPYING README
 %if %{build_seed_games}
-%{_libdir}/girepository-1.0/GnomeGamesSupport-*.typelib
+%{_libdir}/gnome-games/GnomeGamesSupport-*.typelib
 %endif
 %{_datadir}/applications/gnome-sol.desktop
 %{_datadir}/applications/gnome-gnomine.desktop
@@ -354,7 +356,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %if %{build_seed_games}
 # could have gone into -devel there does not seem to be
 # sufficient content yet
-%exclude %{_datadir}/gir-1.0/GnomeGamesSupport-*.gir
+%exclude %{_libdir}/gnome-games/GnomeGamesSupport-*.gir
 %exclude %{_libdir}/gnome-games/libgames-support-gi.so
 %endif
 
@@ -471,6 +473,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 
 
 %changelog
+* Mon Apr 18 2011 Christopher Aillon <caillon at redhat.com> - 3.0.1-1
+- Update to 3.0.1
+- Re-enable seed games
+
 * Thu Apr  7 2011 Matthias Clasen <mclasen at redhat.com> - 3.0.0-2
 - Make the install quiet (#691426)