diff --git a/gnome-games.spec b/gnome-games.spec index 0589ea8..d852628 100644 --- a/gnome-games.spec +++ b/gnome-games.spec @@ -6,11 +6,11 @@ %define build_tali 1 %if %{build_card} -%define sol_schemas aisleriot.schemas -%define bj_schemas blackjack.schemas +%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 %else -%define sol_schemas %{nil} -%define bj_schemas %{nil} +%define card_schemas %{nil} +%define card_desktops %{nil} %endif %if %{build_tali} @@ -19,6 +19,20 @@ %define gtali_schemas %{nil} %endif +%if !%{build_card} && !%{build_tali} +%define omitgames --enable-omitgames=aisleriot,blackjack,gtali +%else +%if !%{build_card} +%define omitgames --enable-omitgames=aisleriot,blackjack +%else +%if !%{build_tali} +%define omitgames --enable-omitgames=gtali +%else +%define omitgames %{nil} +%endif +%endif +%endif + %define glib2_version 2.12.0 %define pango_version 1.8.0 %define gtk2_version 2.6.0 @@ -30,7 +44,7 @@ Summary: GNOME games Name: gnome-games Version: 2.19.4 -Release: 2.2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL Group: Amusements/Games @@ -104,7 +118,7 @@ sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \ autoconf export CFLAGS="$RPM_OPT_FLAGS -DNO_HOWL" -%configure --localstatedir=/var/lib --disable-gnuchess +%configure --localstatedir=/var/lib --disable-gnuchess %{omitgames} make @@ -118,40 +132,6 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL mv $RPM_BUILD_ROOT%{_bindir}/gnometris \ $RPM_BUILD_ROOT%{_bindir}/gnome-falling-blocks -%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 @@ -168,15 +148,8 @@ desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-only-show-in GNOME \ $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 + $RPM_BUILD_ROOT%{_datadir}/applications/gnome-gnect.desktop \ + %{card_desktops} %if %{build_tali} perl -pi -e 's@@[Joe,Jim,James]@g' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gtali.schemas @@ -193,8 +166,8 @@ scrollkeeper-update -q export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` (cd %{_sysconfdir}/gconf/schemas; \ gconftool-2 --makefile-install-rule \ - %{sol_schemas} \ - %{bj_schemas} \ + %{card_schemas} \ + %{gtali_schemas} \ glchess.schemas \ glines.schemas \ gnect.schemas \ @@ -204,7 +177,6 @@ gconftool-2 --makefile-install-rule \ gnomine.schemas \ gnotravex.schemas \ gnotski.schemas \ - gtali.schemas \ iagno.schemas \ mahjongg.schemas \ same-gnome.schemas \ @@ -220,8 +192,8 @@ if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` (cd %{_sysconfdir}/gconf/schemas; \ gconftool-2 --makefile-uninstall-rule \ - %{sol_schemas} \ - %{bj_schemas} \ + %{card_schemas} \ + %{gtali_schemas} \ glchess.schemas \ glines.schemas \ gnect.schemas \ @@ -231,7 +203,6 @@ if [ "$1" -gt 1 ]; then gnomine.schemas \ gnotravex.schemas \ gnotski.schemas \ - gtali.schemas \ iagno.schemas \ mahjongg.schemas \ same-gnome.schemas \ @@ -243,8 +214,8 @@ if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` (cd %{_sysconfdir}/gconf/schemas; \ gconftool-2 --makefile-uninstall-rule \ - %{sol_schemas} \ - %{bj_schemas} \ + %{card_schemas} \ + %{gtali_schemas} \ glchess.schemas \ glines.schemas \ gnect.schemas \ @@ -254,7 +225,6 @@ if [ "$1" -eq 0 ]; then gnomine.schemas \ gnotravex.schemas \ gnotski.schemas \ - gtali.schemas \ iagno.schemas \ mahjongg.schemas \ same-gnome.schemas \ @@ -283,8 +253,10 @@ fi %{_datadir}/gnibbles %{_datadir}/glchess %{_datadir}/gnome-sudoku +%if %{build_card} %{_datadir}/omf/aisleriot %{_datadir}/omf/blackjack +%endif %{_datadir}/omf/gnibbles %{_datadir}/omf/gnobots2 %{_datadir}/omf/gnome-sudoku @@ -293,7 +265,9 @@ fi %{_datadir}/omf/gnomine %{_datadir}/omf/gnotravex %{_datadir}/omf/gnotski +%if %{build_tali} %{_datadir}/omf/gtali +%endif %{_datadir}/omf/glchess %{_datadir}/omf/glines %{_datadir}/omf/gnect @@ -321,7 +295,9 @@ fi %{_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 @@ -355,13 +331,13 @@ fi %changelog -* Sat Jul 21 2007 Hans de Goede - 1:2.19.4-2.2 -- WIP not released yet, when building remove this and update clog entry date +* Sat Jul 21 2007 Hans de Goede - 1:2.19.4-3 - Don't build a private copy of gnuchess, instead require gnuchess (bz 215110) - Rename / rebrand Gnometris to GnomeFallingBlocks, so that it stays clear of the Tetris trademark, and include it (bz 238651) - Don't own dirs under /usr/share/icons/hicolor, instead add Requires: hicolor-icon-theme +- Cleanup handling of with_card and with_tali defines using --enable-omitgames * Thu Jul 5 2007 Ray Strode - 1:2.19.4-2 - Add glchess back (bug 234127)