[gnome-games] simplify spec

Kalev Lember kalev at fedoraproject.org
Mon Mar 26 14:32:13 UTC 2012


commit 17b1016ab2a4a5a25d539479573b6177bbb2fee8
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Sat Mar 24 19:35:05 2012 -0400

    simplify spec

 gnome-games.spec |   70 ++++++-----------------------------------------------
 1 files changed, 8 insertions(+), 62 deletions(-)
---
diff --git a/gnome-games.spec b/gnome-games.spec
index 0ab5c00..028237c 100644
--- a/gnome-games.spec
+++ b/gnome-games.spec
@@ -3,7 +3,6 @@
 %define gettext_package gnome-games
 
 %define build_tali 1
-%define build_seed_games 1
 %define have_sudoku 1
 
 %if %{build_tali}
@@ -12,20 +11,10 @@
 %define gtali %{nil}
 %endif
 
-%if %{build_seed_games}
-%define omitted_seed_games %{nil}
-%define lightsoff lightsoff
-%define swell_foop swell-foop
-%else
-%define omitted_seed_games swell-foop,lightsoff,
-%define lightsoff %{nil}
-%define swell_foop %{nil}
-%endif
-
 %if !%{build_tali}
-%define omitgames --enable-omitgames=%{omitted_seed_games}gtali
+%define omitgames --enable-omitgames=gtali
 %else
-%define omitgames --enable-omitgames=%{omitted_seed_games}
+%define omitgames %{nil}
 %endif
 
 %if %{have_sudoku}
@@ -42,7 +31,7 @@
 Summary: Games for the GNOME desktop
 Name: gnome-games
 Version: 3.3.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GPLv3 and GFDL
 Group: Amusements/Games
@@ -63,9 +52,6 @@ Requires: pygobject2
 Requires: gnome-python2-gconf
 Requires: hicolor-icon-theme
 Requires: gobject-introspection
-%if %{build_seed_games}
-Requires: seed
-%endif
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -77,9 +63,6 @@ BuildRequires: expat-devel
 BuildRequires: gstreamer-devel >= %{gstreamer_version}
 BuildRequires: libcanberra-devel
 BuildRequires: clutter-devel clutter-gtk-devel
-%if %{build_seed_games}
-BuildRequires: seed-devel
-%endif
 BuildRequires: intltool
 BuildRequires: vala-devel
 
@@ -144,12 +127,7 @@ This package contains user documentation for %{name}.
 %build
 %configure --localstatedir=/var/lib \
            --enable-introspection \
-%if ! %{build_seed_games}
-           --disable-introspection \
-           --disable-static \
-%else
            --enable-staging \
-%endif
            %{omitgames}
 make %{?_smp_mflags}
 
@@ -179,13 +157,6 @@ desktop-file-install --vendor gnome --delete-original       \
 perl -pi -e 's@<default></default>@<default>[Joe,Jim,James]</default>@g' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gtali.schemas
 %endif
 
-%if ! %{build_seed_games}
-# Remove lightsoff, seed isn't packaged
-rm -rf $RPM_BUILD_ROOT%{_bindir}/lightsoff                                     \
-        $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
-%endif
 rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-games/libgames-support-gi.{l,}a
 
 %find_lang %{gettext_package} --all-name --with-gnome
@@ -240,29 +211,22 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 
 %files -f translations.lang
 %doc AUTHORS COPYING README
-%if %{build_seed_games}
 %{_libdir}/gnome-games/GnomeGamesSupport-*.typelib
-%endif
 %{_datadir}/applications/gnome-gnomine.desktop
 %{_datadir}/applications/gnome-iagno.desktop
 %if %{have_sudoku}
 %{_datadir}/applications/gnome-sudoku.desktop
 %endif
-%if %{build_seed_games}
 %{_datadir}/applications/gnome-swell-foop.desktop
 # find-lang should find these
 %doc %{_datadir}/help/*/swell-foop
-%endif
-
 %doc %{_datadir}/help/*/gnomine
 %doc %{_datadir}/help/*/iagno
 %doc %{_datadir}/help/*/gnome-sudoku
 
 %{_datadir}/iagno
 %dir %{_datadir}/gnome-games
-%if %{build_seed_games}
 %{_datadir}/gnome-games/swell-foop
-%endif
 %if %{have_sudoku}
 %{_datadir}/gnome-sudoku
 %endif
@@ -272,16 +236,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %if %{have_sudoku}
 %{_datadir}/icons/hicolor/*/apps/gnome-sudoku.*
 %endif
-%if %{build_seed_games}
 %{_datadir}/icons/hicolor/*/apps/swell-foop.*
-%endif
 
 %verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnomine.*
 
 %dir %{_libdir}/gnome-games
-%if %{build_seed_games}
 %{_libdir}/gnome-games/libgames-support-gi.so.*
-%endif
 
 %if %{have_sudoku}
 %{python_sitelib}/gnome_sudoku
@@ -296,9 +256,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %if %{have_sudoku}
 %{_bindir}/gnome-sudoku
 %endif
-%if %{build_seed_games}
 %{_bindir}/swell-foop
-%endif
 
 # these are setgid games
 %attr(2551, root, games) %{_bindir}/iagno
@@ -310,19 +268,17 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_mandir}/man6/gnome-sudoku.6.gz
 %endif
 
-%if %{build_seed_games}
 # could have gone into -devel there does not seem to be
 # sufficient content yet
 %exclude %{_libdir}/gnome-games/GnomeGamesSupport-*.gir
 %exclude %{_libdir}/gnome-games/libgames-support-gi.so
-%endif
 
 %{_datadir}/gnomine
 
 %{_datadir}/glib-2.0/schemas/org.gnome.gnome-sudoku.gschema.xml
-%if %{build_seed_games}
 %{_datadir}/glib-2.0/schemas/org.gnome.swell-foop.gschema.xml
-%endif
+
+%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/swell-foop.*
 
 %files extra
 %defattr(-, root, root)
@@ -347,9 +303,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/applications/gnome-gnotravex.desktop
 %{_datadir}/applications/gnome-gnotski.desktop
 %{_datadir}/applications/gnome-gtali.desktop
-%if %{build_seed_games}
 %{_datadir}/applications/gnome-lightsoff.desktop
-%endif
 %{_datadir}/applications/gnome-mahjongg.desktop
 %{_datadir}/applications/gnome-quadrapassel.desktop
 
@@ -372,15 +326,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %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.*
 %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/swell-foop.*
 
 
 # these are not setgid games
 %{_bindir}/gnect
 %{_bindir}/glchess
-%if %{build_seed_games}
 %{_bindir}/lightsoff
-%endif
 
 # these are setgid games
 %attr(2551, root, games) %{_bindir}/mahjongg
@@ -402,9 +353,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/gtali
 %{_datadir}/mahjongg
 %{_datadir}/quadrapassel
-%if %{build_seed_games}
 %{_datadir}/lightsoff
-%endif
 
 %{_datadir}/icons/hicolor/*/actions/teleport*
 %{_datadir}/icons/hicolor/*/apps/glchess.*
@@ -417,9 +366,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/icons/hicolor/*/apps/gtali.*
 %{_datadir}/icons/hicolor/*/apps/mahjongg.*
 %{_datadir}/icons/hicolor/*/apps/quadrapassel.*
-%if %{build_seed_games}
 %{_datadir}/icons/hicolor/*/apps/lightsoff.*
-%endif
 
 # gsettings schemas
 %{_datadir}/glib-2.0/schemas/org.gnome.gnotravex.gschema.xml
@@ -429,9 +376,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/glib-2.0/schemas/org.gnome.gnotski.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gtali.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.quadrapassel.gschema.xml
-%if %{build_seed_games}
 %{_datadir}/glib-2.0/schemas/org.gnome.lightsoff.gschema.xml
-%endif
 
 %{_datadir}/help/*/glchess
 %{_datadir}/help/*/glines
@@ -443,11 +388,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 %{_datadir}/help/*/gtali
 %{_datadir}/help/*/mahjongg
 %{_datadir}/help/*/quadrapassel
-%if %{build_seed_games}
 %{_datadir}/help/*/lightsoff
-%endif6
 
 %changelog
+* Sat Mar 24 2012 Matthias Clasen <mclasen at redhat.com> - 1:3.3.92-2
+- Simplify spec file, seed games were rewritten in vala
+
 * Wed Mar 21 2012 Richard Hughes <rhughes at redhat.com> 3.3.92-1
 - Update to 3.3.92
 


More information about the scm-commits mailing list