- merged from DEVEL and updated to 2.14.1

Changed files:
    gnome-games.spec -> 1.168

diff --git a/gnome-games.spec b/gnome-games.spec
index 5af380a68b16e518a84542f31d70caccebfaadbe..63d21cefa7be52cd51af3b59a9012280782f6c0c 100644 (file)
--- a/gnome-games.spec
+++ b/gnome-games.spec
@@ -6,13 +6,13 @@ Summary(ru):  
 Summary(uk):   ¶ÇÒÉ Ð¦Ä GNOME
 Summary(wa):   Djeus po GNOME
 Name:          gnome-games
-Version:       2.12.3
+Version:       2.14.1
 Release:       1
 Epoch:         1
 License:       LGPL
 Group:         X11/Applications/Games
-Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-games/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5: 06d3cfaf24dd1f0b2df1df005c69d4ff
+Source0:       http://ftp.gnome.org/pub/gnome/sources/gnome-games/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5: 9893da6c2f8eecdbc596cec9a017a8b2
 Patch0:                %{name}-schemas.patch
 Patch1:                %{name}-include.patch
 Patch2:                %{name}-desktop.patch
@@ -20,13 +20,13 @@ URL:                http://www.gnome.org/
 BuildRequires: GConf2-devel >= 2.12.0
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
+BuildRequires: mdns-bonjour-devel
 BuildRequires: esound-devel
 BuildRequires: gnome-common >= 2.8.0
 BuildRequires: gnome-vfs2-devel >= 2.12.0
 BuildRequires: gob2 >= 2.0.0
 BuildRequires: guile-devel >= 5:1.6.5
 BuildRequires: gtk+2-devel >= 2:2.8.3
-BuildRequires: howl-devel >= 0.9.10
 BuildRequires: intltool >= 0.33
 BuildRequires: libglade2-devel >= 1:2.5.1
 BuildRequires: libgnomeui-devel >= 2.12.0
@@ -44,6 +44,7 @@ Obsoletes:    gnect
 Obsoletes:     gnome
 Obsoletes:     gnome-games-devel
 Obsoletes:     gnome-games-static
+Obsoletes:     gnome-games-stones
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _localstatedir  /var
@@ -160,22 +161,6 @@ Avoid the robots and make them crash into each other.
 %description gnobots2 -l pl
 Gra polegaj±ca na zapobieganiu zderzeniom robotów.
 
-%package stones
-Summary:       GNOME Stones
-Summary(pl):   "Kamienie" dla GNOME
-Group:         X11/Applications/Games
-Requires(post,preun):  GConf2
-Requires(post):        coreutils
-Requires(post,postun): desktop-file-utils
-Requires(post,postun): scrollkeeper
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-
-%description stones
-Boulder Dash like game.
-
-%description stones -l pl
-Gra podobna do Boulder Dasha.
-
 %package gnometris
 Summary:       GNOME Tetris
 Summary(pl):   Tetris dla GNOME
@@ -327,6 +312,8 @@ R
 %{__autoconf}
 %{__automake}
 %configure \
+       --enable-bonjour \
+       --disable-howl \
        --disable-static
 %{__make}
 
@@ -347,7 +334,6 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 %find_lang same-gnome --with-gnome
 %find_lang mahjongg --with-gnome
 %find_lang gtali --with-gnome
-%find_lang gnome-stones --with-gnome
 %find_lang gataxx --with-gnome
 %find_lang gnotravex --with-gnome
 %find_lang gnotski --with-gnome
@@ -459,24 +445,6 @@ done
 %postun        gnobots2
 %scrollkeeper_update_postun
 
-%post stones
-%scrollkeeper_update_post
-%gconf_schema_install gnome-stones.schemas
-%update_desktop_database_post
-
-if [ ! -f %{_gamesdir}/gnome-stones.scores ]; then
-       touch %{_gamesdir}/gnome-stones.scores
-       chown root:games %{_gamesdir}/gnome-stones.scores
-       chmod 664 %{_gamesdir}/gnome-stones.scores
-fi
-
-%preun stones
-%gconf_schema_uninstall gnome-stones.schemas
-
-%postun stones
-%scrollkeeper_update_postun
-%update_desktop_database_postun
-
 %post gnometris
 %scrollkeeper_update_post
 %gconf_schema_install gnometris.schemas
@@ -645,6 +613,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gataxx
 %{_sysconfdir}/gconf/schemas/gataxx.schemas
+%{_datadir}/%{name}/ataxx
 %{_desktopdir}/gataxx.desktop
 %{_omf_dest_dir}/%{name}/gataxx-C.omf
 %{_pixmapsdir}/gataxx.png
@@ -695,28 +664,9 @@ fi
 %lang(es) %{_omf_dest_dir}/%{name}/gnobots2-es.omf
 %lang(it) %{_omf_dest_dir}/%{name}/gnobots2-it.omf
 %{_pixmapsdir}/gnobots2
-%{_pixmapsdir}/gnome-gnobots2.png
-%{_pixmapsdir}/rteleport.png
-%{_pixmapsdir}/teleport.png
+%{_pixmapsdir}/gnome-gnobots2.svg
 %attr(664,root,games) %ghost %{_localstatedir}/games/gnobots2.*
 
-%files stones -f gnome-stones.lang
-%defattr(644,root,root,755)
-%attr(2755,root,games) %{_bindir}/gnome-stones
-%{_sysconfdir}/gconf/schemas/gnome-stones.schemas
-%{_datadir}/gnome-stones
-%{_datadir}/mime-info/gnome-stones.*
-%{_datadir}/gnome-stonesrc
-%lang(ko) %{_datadir}/gnome-stonesrc.ko
-%dir %{_libdir}/gnome-stones
-%dir %{_libdir}/gnome-stones/objects
-%attr(755,root,root) %{_libdir}/gnome-stones/objects/lib*.so
-%{_desktopdir}/gnome-stones.desktop
-%{_omf_dest_dir}/%{name}/gnome-stones-C.omf
-%{_pixmapsdir}/gnome-stones
-%{_pixmapsdir}/gnome-stones*.png
-%attr(664,root,games) %ghost %{_localstatedir}/games/gnome-stones.*
-
 %files gnometris -f gnometris.lang
 %defattr(644,root,root,755)
 %attr(2755,root,games) %{_bindir}/gnometris