[gnome-games/f15/master] Seriously, STFU.
Christopher Aillon
caillon at fedoraproject.org
Tue Apr 19 00:15:58 UTC 2011
commit b4e197aba6c79578bbd28b247f5530a67f44882e
Author: Christopher Aillon <caillon at redhat.com>
Date: Mon Apr 18 17:11:47 2011 -0700
Seriously, STFU.
Don't make me tell you again.
gnome-games.spec | 149 ++++++++++++++++--------------------------------------
1 files changed, 43 insertions(+), 106 deletions(-)
---
diff --git a/gnome-games.spec b/gnome-games.spec
index e46e83b..6545325 100644
--- a/gnome-games.spec
+++ b/gnome-games.spec
@@ -5,19 +5,20 @@
%define build_card 1
%define build_tali 1
%define build_seed_games 0
+%define have_sudoku 0
%if %{build_card}
-%define card_schemas aisleriot.schemas
+%define card aisleriot
%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 %{nil}
%define card_desktops %{nil}
%endif
%if %{build_tali}
-%define gtali_schemas gtali.schemas
+%define gtali gtali
%else
-%define gtali_schemas %{nil}
+%define gtali %{nil}
%endif
%if %{build_seed_games}
@@ -40,6 +41,12 @@
%endif
%endif
+%if %{have_sudoku}
+%define sudoku gnome-sudoku
+%else
+%define sudoku %{nil}
+%endif
+
%define glib2_version 2.12.0
%define pango_version 1.8.0
%define libgnomeui_version 2.5.0
@@ -50,7 +57,7 @@
Summary: Games for the GNOME desktop
Name: gnome-games
Version: 3.0.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Epoch: 1
License: GPLv2+ and GPLv3 and GFDL
Group: Amusements/Games
@@ -209,110 +216,26 @@ grep -v "/sr at latin/figures" help-tmp.lang > help.lang
%post
-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 \
->& /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
+%gconf_schema_upgrade %{card} gnomine iagno %{sudoku}
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%post extra
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-(cd %{_sysconfdir}/gconf/schemas; \
-gconftool-2 --makefile-install-rule \
- %{gtali_schemas} \
-# glchess.schemas \
- glines.schemas \
- gnect.schemas \
- gnibbles.schemas \
- gnobots2.schemas \
- quadrapassel.schemas \
- gnotravex.schemas \
- gnotski.schemas \
-%if %{build_seed_games}
- lightsoff.schemas \
-%endif
- mahjongg.schemas \
->& /dev/null || : )
-touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+%gconf_schema_upgrade %{gtali} glines gnect gnibbles gnobots2 gnotravex gnotski mahjongg quadrapassel
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%pre
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- (cd %{_sysconfdir}/gconf/schemas; \
- if test -f same-gnome.schemas ; then gconftool-2 --makefile-uninstall-rule same-gnome.schemas ; fi ; \
- if test -f swell-foop.schemas ; then gconftool-2 --makefile-uninstall-rule swell-foop.schemas ; fi ; \
- gconftool-2 --makefile-uninstall-rule \
- %{card_schemas} \
- gnomine.schemas \
- iagno.schemas \
-# gnome-sudoku.schemas \
->& /dev/null || : )
-fi
+%gconf_schema_prepare %{card} gnomine iagno %{sudoku}
+%gconf_schema_obsolete same-gnome swell-foop
%pre extra
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- (cd %{_sysconfdir}/gconf/schemas; \
- if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; fi ; \
- if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; fi ; \
- if test -f blackjack.schemas ; then gconftool-2 --makefile-uninstall-rule blackjack.schemas ; fi ; \
- gconftool-2 --makefile-uninstall-rule \
- %{gtali_schemas} \
-# glchess.schemas \
- glines.schemas \
- gnect.schemas \
- gnibbles.schemas \
- gnobots2.schemas \
- gnotravex.schemas \
- gnotski.schemas \
- mahjongg.schemas \
->& /dev/null || : )
-fi
+%gconf_schema_prepare %{gtali} glines gnect gnibbles gnobots2 gnotravex gnotski mahjongg quadrapassel
+%gconf_schema_obsolete blackjack glchess gnometris
%preun
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- (cd %{_sysconfdir}/gconf/schemas; \
- if test -f same-gnome.schemas ; then gconftool-2 --makefile-uninstall-rule same-gnome.schemas ; fi ; \
- if test -f swell-foop.schemas ; then gconftool-2 --makefile-uninstall-rule swell-foop.schemas ; fi ; \
- gconftool-2 --makefile-uninstall-rule \
- %{card_schemas} \
- gnomine.schemas \
- iagno.schemas \
-# gnome-sudoku.schemas \
->& /dev/null || : )
-fi
+%gconf_schema_remove %{card} gnomine iagno %{sudoku}
%preun extra
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- (cd %{_sysconfdir}/gconf/schemas; \
- if test -f gnometris.schemas ; then gconftool-2 --makefile-uninstall-rule gnometris.schemas ; fi ; \
- if test -f quadrapassel.schemas ; then gconftool-2 --makefile-uninstall-rule quadrapassel.schemas ; fi ; \
- if test -f blackjack.schemas ; then gconftool-2 --makefile-uninstall-rule blackjack.schemas ; fi ; \
- gconftool-2 --makefile-uninstall-rule \
- %{gtali_schemas} \
-# glchess.schemas \
- glines.schemas \
- gnect.schemas \
- gnibbles.schemas \
- gnobots2.schemas \
- gnotravex.schemas \
- gnotski.schemas \
- mahjongg.schemas \
->& /dev/null || : )
-fi
+%gconf_schema_remove %{gtali} glines gnect gnibbles gnobots2 gnotravex gnotski mahjongg quadrapassel
%postun
if [ $1 -eq 0 ]; then
@@ -348,7 +271,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
%{_datadir}/applications/gnome-sol.desktop
%{_datadir}/applications/gnome-gnomine.desktop
%{_datadir}/applications/gnome-iagno.desktop
-#%{_datadir}/applications/gnome-sudoku.desktop
+%if %{have_sudoku}
+%{_datadir}/applications/gnome-sudoku.desktop
+%endif
%if %{build_seed_games}
%{_datadir}/applications/gnome-swell-foop.desktop
%endif
@@ -364,12 +289,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
%{_datadir}/gnome-games/swell-foop
%endif
%{_datadir}/gnome-games-common
-#%{_datadir}/gnome-sudoku
+%if %{have_sudoku}
+%{_datadir}/gnome-sudoku
+%endif
%{_datadir}/icons/hicolor/*/apps/gnome-aisleriot.*
%{_datadir}/icons/hicolor/*/apps/gnome-iagno.*
%{_datadir}/icons/hicolor/*/apps/gnomine.*
-#%{_datadir}/icons/hicolor/*/apps/gnome-sudoku.*
+%if %{have_sudoku}
+%{_datadir}/icons/hicolor/*/apps/gnome-sudoku.*
+%endif
%if %{build_seed_games}
%{_datadir}/icons/hicolor/*/apps/gnome-swell-foop.*
%endif
@@ -382,7 +311,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
%{_libdir}/gnome-games/libgames-support-gi.so.*
%endif
-#%{python_sitelib}/gnome_sudoku
+%if %{have_sudoku}
+%{python_sitelib}/gnome_sudoku
+%endif
# gconf schemas
%if %{build_card}
@@ -390,7 +321,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
%endif
%config(noreplace) %{_sysconfdir}/gconf/schemas/gnomine.schemas
%config(noreplace) %{_sysconfdir}/gconf/schemas/iagno.schemas
-#%config(noreplace) %{_sysconfdir}/gconf/schemas/gnome-sudoku.schemas
+%if %{have_sudoku}
+%config(noreplace) %{_sysconfdir}/gconf/schemas/gnome-sudoku.schemas
+%endif
%if %{build_seed_games}
%config(noreplace) %{_sysconfdir}/gconf/schemas/swell-foop.schemas
%endif
@@ -400,7 +333,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
# these are not setgid games
%{_bindir}/sol
-#%{_bindir}/gnome-sudoku
+%if %{have_sudoku}
+%{_bindir}/gnome-sudoku
+%endif
%if %{build_seed_games}
%{_bindir}/swell-foop
%endif
@@ -411,7 +346,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
%{_mandir}/man6/iagno.6.gz
%{_mandir}/man6/gnomine.6.gz
-#%{_mandir}/man6/gnome-sudoku.6.gz
+%if %{have_sudoku}
+%{_mandir}/man6/gnome-sudoku.6.gz
+%endif
%{_mandir}/man6/sol.6.gz
%if %{build_seed_games}
More information about the scm-commits
mailing list