rpms/gnome-games/devel gnome-games-2.19.4-gnometris-rebrand.patch, NONE, 1.1 gnome-games.spec, 1.133, 1.134

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/gnome-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18504

Modified Files:
	gnome-games.spec 
Added Files:
	gnome-games-2.19.4-gnometris-rebrand.patch 
Log Message:
* Sat Jul 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 1:2.19.4-2.2
- WIP not released yet, when building remove this and update clog entry date
- 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


gnome-games-2.19.4-gnometris-rebrand.patch:

--- NEW FILE gnome-games-2.19.4-gnometris-rebrand.patch ---
diff -up gnome-games-2.19.4/README.rebrand gnome-games-2.19.4/README
--- gnome-games-2.19.4/README.rebrand	2007-06-18 19:54:25.000000000 +0200
+++ gnome-games-2.19.4/README	2007-07-21 09:36:43.000000000 +0200
@@ -48,8 +48,8 @@ Four-in-a-row   The classic game where e
                 popular version of this in the real world called
                 Connect Four. (gnect)
 
-Gnometris       That Russian game of fitting falling geometric
-                shapes. Need I say more ? (gnometris)
+GnomeFallingBlocks   That Russian game of fitting falling geometric
+                shapes. Need I say more ? (gnome-falling-blocks)
 
 Iagno           Gnome version of the popular Othello (R) disk flipping
                 game. The goal is to control all the disks on the
diff -up gnome-games-2.19.4/gnometris/help/C/gnometris.xml.rebrand gnome-games-2.19.4/gnometris/help/C/gnometris.xml
--- gnome-games-2.19.4/gnometris/help/C/gnometris.xml.rebrand	2007-06-18 21:03:52.000000000 +0200
+++ gnome-games-2.19.4/gnometris/help/C/gnometris.xml	2007-07-21 09:37:37.000000000 +0200
@@ -122,10 +122,10 @@ application or
  <title>Introduction</title>
 
 <!--synopsis of game-->
-  <para><application>Gnometris</application> comes from the classic falling-block game, <application>Tetris</application>. The goal of the game is to create complete horizontal lines of blocks, which will disappear. The blocks come in seven different shapes made from four blocks each: one straight, two L-shaped, one square, and two S-shaped. The blocks fall from the top center of the screen in a random order. You rotate the blocks and move them across the screen to drop them in complete lines. You score by dropping blocks fast and completing lines. As your score gets higher, you level up and the blocks fall faster.</para>
+  <para>The goal of <application>Gnometris</application> is to create complete horizontal lines of blocks, which will disappear. The blocks come in seven different shapes made from four blocks each: one straight, two L-shaped, one square, and two S-shaped. The blocks fall from the top center of the screen in a random order. You rotate the blocks and move them across the screen to drop them in complete lines. You score by dropping blocks fast and completing lines. As your score gets higher, you level up and the blocks fall faster.</para>
 
 <!--running game-->
-   <para>To run <application>Gnometris</application>, select <menuchoice><guimenu>Applications</guimenu><guisubmenu>Games</guisubmenu><guimenuitem>Gnometris</guimenuitem></menuchoice>, or type <command>gnometris</command> in the command line.</para>
+   <para>To run <application>Gnometris</application>, select <menuchoice><guimenu>Applications</guimenu><guisubmenu>Games</guisubmenu><guimenuitem>Gnometris</guimenuitem></menuchoice>, or type <command>gnome-falling-blocks</command> in the command line.</para>
 
 <!--part of gnome-games-->
    <para><application>Gnometris</application> is included in the <filename>gnome-games</filename> package, which is part of the GNOME desktop environment. This document describes version &version; of <application>Gnometris</application>.</para>
diff -up gnome-games-2.19.4/gnometris/gnometris.desktop.in.rebrand gnome-games-2.19.4/gnometris/gnometris.desktop.in
--- gnome-games-2.19.4/gnometris/gnometris.desktop.in.rebrand	2007-06-18 19:54:00.000000000 +0200
+++ gnome-games-2.19.4/gnometris/gnometris.desktop.in	2007-07-21 09:36:43.000000000 +0200
@@ -3,7 +3,7 @@ Encoding=UTF-8
 _Name=Gnometris
 _Comment=Fit falling blocks together
 Icon=gnome-gnometris
-Exec=gnometris
+Exec=gnome-falling-blocks
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;BlocksGame;


Index: gnome-games.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-games/devel/gnome-games.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- gnome-games.spec	20 Jul 2007 07:47:29 -0000	1.133
+++ gnome-games.spec	21 Jul 2007 08:09:56 -0000	1.134
@@ -30,12 +30,13 @@
 Summary: GNOME games
 Name: gnome-games
 Version: 2.19.4
-Release: 2.1%{?dist}
+Release: 2.2%{?dist}
 Epoch: 1
 License: GPL
 Group: Amusements/Games
 Source: http://download.gnome.org/sources/gnome-games/2.19/gnome-games-%{version}.tar.bz2
 Patch0: gnome-games-2.19.3-dupe.patch
+Patch1: gnome-games-2.19.4-gnometris-rebrand.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Obsoletes: gnome-games-devel
@@ -53,6 +54,7 @@
 Requires: gnome-python2-gnomeprint
 Requires: pygtkglext PyOpenGL
 Requires: gnuchess
+Requires: hicolor-icon-theme
 
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -88,6 +90,12 @@
 %prep
 %setup -q
 %patch0 -p1 -b .dupe
+# rebrand gnometris as some think the name is to similar to a trademark
+%patch1 -p1 -b .rebrand
+sed -i -e 's/Gnometris/GnomeFallingBlocks/g' \
+  -e 's/GNOMEtris/GnomeFallingBlocks/g' \
+  po/*.po gnometris/help/*/*.po gnometris/help/C/gnometris.xml \
+  gnometris/*.cpp gnometris/gnometris.desktop.in
 
 #cp -f gnometris/sounds/gameover.wav gnobots2/bad.wav
 #cp -f gnometris/sounds/gameover.wav gnibbles/sounds/pop.wav
@@ -107,14 +115,8 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-#
-# lawyers are fun
-# lawyers are fun little
-#
-rm -f $RPM_BUILD_ROOT%{_bindir}/gnometris
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gnometris.desktop
-rm -rf $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnometris
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gnometris.schemas
+mv $RPM_BUILD_ROOT%{_bindir}/gnometris \
+  $RPM_BUILD_ROOT%{_bindir}/gnome-falling-blocks
 
 %if ! %{build_card}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/blackjack
@@ -298,7 +300,7 @@
 %{_datadir}/omf/iagno
 %{_datadir}/omf/mahjongg
 %{_datadir}/omf/same-gnome
-%{_datadir}/icons/hicolor/*
+%{_datadir}/icons/hicolor/*/*/*
 %config(noreplace) %attr(664, games, games) /var/lib/games/*
 
 %{_libdir}/gnome-games
@@ -344,6 +346,7 @@
 %attr(2551, root, games) %{_bindir}/gtali
 %endif
 %attr(2551, root, games) %{_bindir}/gnobots2
+%attr(2551, root, games) %{_bindir}/gnome-falling-blocks
 %attr(2551, root, games) %{_bindir}/gnotravex
 %attr(2551, root, games) %{_bindir}/gnotski
 %attr(2551, root, games) %{_bindir}/gnibbles
@@ -352,9 +355,13 @@
 
 
 %changelog
-* Fri Jul 20 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 1:2.19.4-2.1
+* Sat Jul 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 1:2.19.4-2.2
 - WIP not released yet, when building remove this and update clog entry date
 - 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
 
 * Thu Jul  5 2007 Ray Strode <rstrode at redhat.com> - 1:2.19.4-2
 - Add glchess back (bug 234127)