[gnome-games/f14/master] Actually push new spec
Michel Alexandre Salim
salimma at fedoraproject.org
Fri Nov 5 14:09:16 UTC 2010
commit 1479468f77a901395dc683671a479c6ea185bf14
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date: Fri Nov 5 15:09:00 2010 +0100
Actually push new spec
gnome-games.spec | 200 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 127 insertions(+), 73 deletions(-)
---
diff --git a/gnome-games.spec b/gnome-games.spec
index 659fc39..2c07217 100644
--- a/gnome-games.spec
+++ b/gnome-games.spec
@@ -51,7 +51,7 @@
Summary: Games for the GNOME desktop
Name: gnome-games
Version: 2.32.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 1
License: GPLv2+ and GPLv3 and GFDL
Group: Amusements/Games
@@ -59,8 +59,9 @@ Group: Amusements/Games
Source: http://download.gnome.org/sources/gnome-games/2.32/gnome-games-%{version}.tar.bz2
Patch0: lsb-really?.patch
+Patch1: gnome-games-2.32.0-use-only-gtk2.patch
-Obsoletes: gnome-games-devel
+Obsoletes: gnome-games-devel < %{epoch}:%{version}-%{release}
URL: http://projects.gnome.org/gnome-games/
Requires(pre): GConf2
@@ -71,7 +72,9 @@ Requires: GConf2
Requires: pygtk2
Requires: gnome-python2-gconf
Requires: hicolor-icon-theme
+%if %{build_seed_games}
Requires: seed
+%endif
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: pango-devel >= %{pango_version}
@@ -99,10 +102,10 @@ BuildRequires: gnome-doc-utils >= 0.3.2
BuildRequires: scrollkeeper
BuildRequires: gnome-common
-Provides: gnome-sudoku
-Obsoletes: gnome-sudoku
+Provides: gnome-sudoku = %{epoch}:%{version}-%{release}
+Obsoletes: gnome-sudoku < %{epoch}:%{version}-%{release}
-Provides: glchess
+Provides: glchess = %{epoch}:%{version}-%{release}
Obsoletes: glchess < 2.0
@@ -137,13 +140,19 @@ This package contains user documentation for %{name}.
%prep
%setup -q
%patch0 -p1 -b .no-lsb
+%if %{build_seed_games}
+%patch1 -p1 -b .use-only-gtk2
+%endif
autoreconf -i -f
%build
%configure --localstatedir=/var/lib \
--disable-gnuchess \
+%if ! %{build_seed_games}
--disable-introspection \
+ --disable-static \
+%endif
--with-gtk=2.0 \
%{omitgames}
make
@@ -161,8 +170,8 @@ rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper
## install desktop files
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --remove-category Application \
- --remove-category PuzzleGame \
+ --remove-category Application \
+ --remove-category PuzzleGame \
$RPM_BUILD_ROOT%{_datadir}/applications/*
desktop-file-install --vendor gnome --delete-original \
@@ -175,29 +184,37 @@ 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%{_sysconfdir}/gconf/schemas/lightsoff.schemas \
- $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
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/lightsoff.schemas \
+ $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
+
+# remove .la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-games/libgames-support-gi.la
+%endif
%find_lang %{gettext_package} --all-name --with-gnome
grep "/usr/share/locale" %{gettext_package}.lang > translations.lang
-grep -v "/usr/share/locale" %{gettext_package}.lang > help.lang
+grep -v "/usr/share/locale" %{gettext_package}.lang > help-tmp.lang
+# not sure why sr at latin/figures is listed -- with other languages,
+# only ${LANG} is listed, and ${LANG}/figures is not
+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} \
+ %{card_schemas} \
%if %{build_seed_games}
- swell-foop.schemas \
+ swell-foop.schemas \
%endif
- gnomine.schemas \
- iagno.schemas \
- gnome-sudoku.schemas \
+ gnomine.schemas \
+ iagno.schemas \
+ gnome-sudoku.schemas \
> /dev/null || : )
touch %{_datadir}/icons/hicolor
@@ -209,16 +226,19 @@ fi
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 \
- mahjongg.schemas \
+ %{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 || :
@@ -229,10 +249,10 @@ if [ "$1" -gt 1 ]; then
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 \
+ %{card_schemas} \
+ gnomine.schemas \
+ iagno.schemas \
+ gnome-sudoku.schemas \
> /dev/null || : )
fi
@@ -244,15 +264,15 @@ if [ "$1" -gt 1 ]; then
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 \
+ %{gtali_schemas} \
+ glchess.schemas \
+ glines.schemas \
+ gnect.schemas \
+ gnibbles.schemas \
+ gnobots2.schemas \
+ gnotravex.schemas \
+ gnotski.schemas \
+ mahjongg.schemas \
> /dev/null || : )
fi
@@ -263,10 +283,10 @@ if [ "$1" -eq 0 ]; then
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 \
+ %{card_schemas} \
+ gnomine.schemas \
+ iagno.schemas \
+ gnome-sudoku.schemas \
> /dev/null || : )
fi
@@ -278,15 +298,15 @@ if [ "$1" -eq 0 ]; then
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 \
+ %{gtali_schemas} \
+ glchess.schemas \
+ glines.schemas \
+ gnect.schemas \
+ gnibbles.schemas \
+ gnobots2.schemas \
+ gnotravex.schemas \
+ gnotski.schemas \
+ mahjongg.schemas \
> /dev/null || : )
fi
@@ -316,6 +336,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f translations.lang
%defattr(-, root, root)
%doc AUTHORS COPYING README
+%if %{build_seed_games}
+%{_libdir}/girepository-1.0/GnomeGamesSupport-*.typelib
+%endif
%{_datadir}/applications/gnome-sol.desktop
%{_datadir}/applications/gnome-gnomine.desktop
%{_datadir}/applications/gnome-iagno.desktop
@@ -347,19 +370,23 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%verify(not md5 size mtime) %config(noreplace) %attr(664, games, games) /var/lib/games/gnomine.*
-%{_libdir}/gnome-games
+%dir %{_libdir}/gnome-games
+%{_libdir}/gnome-games/ar-cards-renderer
+%if %{build_seed_games}
+%{_libdir}/gnome-games/libgames-support-gi.so.*
+%endif
%{python_sitelib}/gnome_sudoku
# gconf schemas
%if %{build_card}
-%{_sysconfdir}/gconf/schemas/aisleriot.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/aisleriot.schemas
%endif
-%{_sysconfdir}/gconf/schemas/gnomine.schemas
-%{_sysconfdir}/gconf/schemas/iagno.schemas
-%{_sysconfdir}/gconf/schemas/gnome-sudoku.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/gnomine.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/iagno.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/gnome-sudoku.schemas
%if %{build_seed_games}
-%{_sysconfdir}/gconf/schemas/swell-foop.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/swell-foop.schemas
%endif
# these are not setgid games
@@ -378,6 +405,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_mandir}/man6/gnome-sudoku.6.gz
%{_mandir}/man6/sol.6.gz
+%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/libgames-support-gi.so
+%endif
+
+
%files extra
%defattr(-, root, root)
@@ -393,6 +428,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_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
@@ -420,6 +458,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
# 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
@@ -434,18 +475,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%attr(2551, root, games) %{_bindir}/glines
# gconf schemas
-%{_sysconfdir}/gconf/schemas/glines.schemas
-%{_sysconfdir}/gconf/schemas/gnect.schemas
-%{_sysconfdir}/gconf/schemas/gnibbles.schemas
-%{_sysconfdir}/gconf/schemas/gnobots2.schemas
-%{_sysconfdir}/gconf/schemas/quadrapassel.schemas
-%{_sysconfdir}/gconf/schemas/gnotravex.schemas
-%{_sysconfdir}/gconf/schemas/gnotski.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/glines.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/gnect.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/gnibbles.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/gnobots2.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/quadrapassel.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/gnotravex.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/gnotski.schemas
%if %{build_tali}
-%{_sysconfdir}/gconf/schemas/gtali.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/gtali.schemas
%endif
-%{_sysconfdir}/gconf/schemas/mahjongg.schemas
-%{_sysconfdir}/gconf/schemas/glchess.schemas
+%if %{build_seed_games}
+%config(noreplace) %{_sysconfdir}/gconf/schemas/lightsoff.schemas
+%endif
+%config(noreplace) %{_sysconfdir}/gconf/schemas/mahjongg.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/glchess.schemas
%{_datadir}/gnome-games/glines
%{_datadir}/gnome-games/gnect
@@ -453,6 +497,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/gnome-games/gnobots2
%{_datadir}/gnome-games/quadrapassel
%{_datadir}/gnome-games/gtali
+%if %{build_seed_games}
+%{_datadir}/gnome-games/lightsoff
+%endif
%{_datadir}/gnome-games/mahjongg
%{_datadir}/gnome-games/gnotski
@@ -461,16 +508,23 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/icons/hicolor/*/apps/gnome-glines.*
%{_datadir}/icons/hicolor/*/apps/gnome-gnect.*
%{_datadir}/icons/hicolor/*/apps/gnome-gnibbles.*
- %{_datadir}/icons/hicolor/*/apps/gnome-quadrapassel.*
-# %{_datadir}/icons/hicolor/*/apps/gnome-gnometris.*
+%{_datadir}/icons/hicolor/*/apps/gnome-quadrapassel.*
+# %%{_datadir}/icons/hicolor/*/apps/gnome-gnometris.*
%{_datadir}/icons/hicolor/*/apps/gnome-klotski.*
%{_datadir}/icons/hicolor/*/apps/gnome-mahjongg.*
+%if %{build_seed_games}
+%{_datadir}/icons/hicolor/*/apps/gnome-lightsoff.*
+%endif
%{_datadir}/icons/hicolor/*/apps/gnome-robots.*
%{_datadir}/icons/hicolor/*/apps/gnome-tali.*
%{_datadir}/icons/hicolor/*/apps/gnome-tetravex.*
%changelog
+* Fri Nov 5 2010 Michel Salim <salimma at fedoraproject.org> - 1:2.32.0-4
+- Only require seed if seed games are enabled
+- spec cleanups
+
* Fri Oct 01 2010 Ray Strode <rstrode at redhat.com> 2.32.0-3
- Temporarily disable seed games
Resolves: #636118
@@ -1193,7 +1247,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
- Remove .desktop for gturing
* Mon Jul 17 2000 Jonathan Blandford <jrb at redhat.com>
-- Mark high-score files as %config(noreplace).
+- Mark high-score files as %%config(noreplace).
* Thu Jul 13 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
More information about the scm-commits
mailing list