[pioneers] Update to upstream 0.12.4
Paul W. Frields
pfrields at fedoraproject.org
Fri Jul 29 13:55:13 UTC 2011
commit 02535739a673bd0888301aaced68ca83455cf7f0
Author: Paul W. Frields <stickster at gmail.com>
Date: Fri Jul 29 09:51:14 2011 -0400
Update to upstream 0.12.4
.gitignore | 1 +
...anitize.patch => pioneers-0.12.4-sanitize.patch | 622 ++++++++++----------
pioneers.spec | 9 +-
sources | 2 +-
4 files changed, 310 insertions(+), 324 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fed3aee..b9222ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
pioneers-0.12.3.tar.gz
+/pioneers-0.12.4.tar.gz
diff --git a/pioneers-0.12.1-sanitize.patch b/pioneers-0.12.4-sanitize.patch
similarity index 66%
rename from pioneers-0.12.1-sanitize.patch
rename to pioneers-0.12.4-sanitize.patch
index 842d706..4f279d8 100644
--- a/pioneers-0.12.1-sanitize.patch
+++ b/pioneers-0.12.4-sanitize.patch
@@ -1,182 +1,6 @@
-diff -U0 pioneers-0.12.2/ChangeLog.foo pioneers-0.12.2/ChangeLog
---- pioneers-0.12.2/ChangeLog.foo 2008-05-01 21:04:37.000000000 +0200
-+++ pioneers-0.12.2/ChangeLog 2008-09-07 17:01:15.000000000 +0200
-@@ -3711 +3711 @@
-- * One of the official rule variants for Settlers of Catan is
-+ * One of the official rule variants is
-diff -up pioneers-0.12.2/README.foo pioneers-0.12.2/README
---- pioneers-0.12.2/README.foo 2007-12-16 20:10:47.000000000 +0100
-+++ pioneers-0.12.2/README 2008-09-07 17:01:15.000000000 +0200
-@@ -1,8 +1,8 @@
- Pioneers
-
--Pioneers is an Internet playable implementation of the Settlers of
--Catan board game. The aim is to remain as faithful to the board game
--as is possible.
-+Pioneers is a computerized version of a well known strategy board game. The
-+goal of the game is to colonize an island. The players play the first
-+colonists hence the name pioneers.
-
- Playing the Game
- ================
-diff -up pioneers-0.12.2/client/gtk/gui.c.foo pioneers-0.12.2/client/gtk/gui.c
---- pioneers-0.12.2/client/gtk/gui.c.foo 2008-05-01 21:05:57.000000000 +0200
-+++ pioneers-0.12.2/client/gtk/gui.c 2008-09-07 17:01:15.000000000 +0200
-@@ -55,14 +55,12 @@ enum {
- TRADE_PAGE, /* trading interface */
- QUOTE_PAGE, /* submit quotes page */
- LEGEND_PAGE, /* legend */
-- SPLASH_PAGE /* splash screen */
- };
-
- static GtkWidget *map_notebook; /* map area panel */
- static GtkWidget *trade_page; /* trade page in map area */
- static GtkWidget *quote_page; /* quote page in map area */
- static GtkWidget *legend_page; /* legend page in map area */
--static GtkWidget *splash_page; /* splash page in map area */
-
- static GtkWidget *develop_notebook; /* development card area panel */
-
-@@ -85,8 +83,6 @@ static gboolean legend_page_enabled = TR
-
- static GList *rules_callback_list = NULL;
-
--#define PIONEERS_PIXMAP_SPLASH "pioneers/splash.png"
--
- static const gchar *pioneers_pixmaps[] = {
- PIONEERS_PIXMAP_DICE,
- PIONEERS_PIXMAP_TRADE,
-@@ -524,50 +520,6 @@ void gui_show_legend_page(gboolean show)
- gtk_widget_hide(legend_page);
- }
-
--void gui_show_splash_page(gboolean show, GtkWidget * chat_widget)
--{
-- static GtkWidget *widget = NULL;
-- if (chat_widget != NULL)
-- widget = chat_widget;
-- g_assert(widget != NULL);
--
-- chat_set_grab_focus_on_update(TRUE);
-- if (show) {
-- gtk_widget_show(splash_page);
-- gtk_notebook_set_current_page(GTK_NOTEBOOK(map_notebook),
-- SPLASH_PAGE);
-- gtk_widget_hide(widget);
-- } else {
-- gtk_widget_hide(splash_page);
-- gtk_notebook_set_current_page(GTK_NOTEBOOK(map_notebook),
-- MAP_PAGE);
-- gtk_widget_show(widget);
-- }
--}
--
--static GtkWidget *splash_build_page(void)
--{
-- GtkWidget *pm;
-- GtkWidget *viewport;
-- gchar *filename;
--
-- filename = g_build_filename(DATADIR, "pixmaps", "pioneers",
-- "splash.png", NULL);
-- pm = gtk_image_new_from_file(filename);
-- g_free(filename);
--
-- /* The viewport avoids that the pixmap is drawn up into the tab area if
-- * it's too large for the space provided. */
-- viewport = gtk_viewport_new(NULL, NULL);
-- gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport),
-- GTK_SHADOW_NONE);
-- gtk_widget_show(viewport);
-- gtk_widget_set_size_request(pm, 1, 1);
-- gtk_widget_show(pm);
-- gtk_container_add(GTK_CONTAINER(viewport), pm);
-- return viewport;
--}
--
- static GtkWidget *build_map_panel(void)
- {
- GtkWidget *lbl;
-@@ -608,13 +560,6 @@ static GtkWidget *build_map_panel(void)
- gui_show_legend_page(FALSE);
- theme_register_callback(G_CALLBACK(gui_theme_changed));
-
-- /* Tab page name, shown for the splash screen */
-- lbl = gtk_label_new(_("Welcome to Pioneers"));
-- gtk_widget_show(lbl);
-- splash_page = splash_build_page();
-- gtk_notebook_insert_page(GTK_NOTEBOOK(map_notebook),
-- splash_page, lbl, SPLASH_PAGE);
--
- return map_notebook;
- }
-
-@@ -757,7 +702,6 @@ static GtkWidget *build_main_interface(v
- gtk_paned_pack1(GTK_PANED(vpaned), build_map_panel(), TRUE, TRUE);
-
- chat_panel = gtk_vbox_new(FALSE, 0);
-- gui_show_splash_page(TRUE, chat_panel);
-
- panel = chat_build_panel();
- frontend_gui_register(panel, GUI_DISCONNECT, NULL);
-diff -up pioneers-0.12.2/client/gtk/offline.c.foo pioneers-0.12.2/client/gtk/offline.c
---- pioneers-0.12.2/client/gtk/offline.c.foo 2008-05-01 21:05:57.000000000 +0200
-+++ pioneers-0.12.2/client/gtk/offline.c 2008-09-07 17:01:15.000000000 +0200
-@@ -88,7 +88,6 @@ static void frontend_offline_gui(GuiEven
- && !connectable);
- break;
- case GUI_CONNECT_TRY:
-- gui_show_splash_page(FALSE, NULL);
- gui_set_net_status(_("Connecting"));
-
- connectable = FALSE;
-diff -up pioneers-0.12.2/client/help/C/pioneers-C.omf.foo pioneers-0.12.2/client/help/C/pioneers-C.omf
---- pioneers-0.12.2/client/help/C/pioneers-C.omf.foo 2007-12-16 20:10:46.000000000 +0100
-+++ pioneers-0.12.2/client/help/C/pioneers-C.omf 2008-09-07 17:01:15.000000000 +0200
-@@ -17,8 +17,8 @@
- <version identifier="1.0" date="2003-10-07" description="Updated to full OMF format"/>
- <subject category="GNOME|Games"/>
- <description>
-- Pioneers is an Internet playable implementation of
-- the Settlers of Catan board game.
-+ Pioneers is a computerized version of a well known strategy board game.
-+ The goal of the game is to colonize an island.
- </description>
- <type>
- user's guide
-diff -up pioneers-0.12.2/client/help/C/pioneers.xml.foo pioneers-0.12.2/client/help/C/pioneers.xml
---- pioneers-0.12.2/client/help/C/pioneers.xml.foo 2008-04-27 22:40:58.000000000 +0200
-+++ pioneers-0.12.2/client/help/C/pioneers.xml 2008-09-07 17:01:15.000000000 +0200
-@@ -58,10 +58,11 @@
- <simplesect id="Authors">
- <title>Authors and History</title>
- <para>
-- Pioneers is a GNOME game based upon the board game Settlers of Catan
-- created by Mayfair Games. Pioneers was originally authored by Dave
-- Cole in the spring and summer of 1999, under the name Gnocatan.
-- Dave wanted to be able to
-+ Pioneers is a computerized version of a well known strategy board game.
-+ The goal of the game is to colonize an island. The players play the
-+ first colonists hence the name pioneers.
-+ Pioneers was originally authored by Dave Cole in the spring and summer
-+ of 1999. Dave wanted to be able to
- play the game without having to travel, so he developed a computer
- implementation of the game. The Pioneers project stalled in the late
- summer of 1999 and saw little development until the early spring of
-@@ -79,9 +80,6 @@
- on the user interface.
- </para>
- <para>
-- In June 2005 the project was renamed from Gnocatan to Pioneers.
-- </para>
-- <para>
- To be continued...
- </para>
- </simplesect>
-diff -up pioneers-0.12.2/common/gtk/aboutbox.c.foo pioneers-0.12.2/common/gtk/aboutbox.c
---- pioneers-0.12.2/common/gtk/aboutbox.c.foo 2008-05-01 21:05:56.000000000 +0200
-+++ pioneers-0.12.2/common/gtk/aboutbox.c 2008-09-07 17:01:15.000000000 +0200
-@@ -37,10 +37,9 @@ static GtkWidget *about = NULL; /* The a
+--- ./common/gtk/aboutbox.c.sanitize 2008-03-26 17:20:57.000000000 -0400
++++ ./common/gtk/aboutbox.c 2011-07-29 09:47:15.982733045 -0400
+@@ -37,10 +37,9 @@
void aboutbox_display(const gchar * title, const gchar ** authors)
{
@@ -188,7 +12,7 @@ diff -up pioneers-0.12.2/common/gtk/aboutbox.c.foo pioneers-0.12.2/common/gtk/ab
gint i;
if (about != NULL) {
-@@ -58,22 +57,11 @@ void aboutbox_display(const gchar * titl
+@@ -58,22 +57,11 @@
g_signal_connect(G_OBJECT(about), "destroy",
G_CALLBACK(gtk_widget_destroyed), &about);
@@ -211,10 +35,9 @@ diff -up pioneers-0.12.2/common/gtk/aboutbox.c.foo pioneers-0.12.2/common/gtk/ab
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
_("Version:"), -1,
"bold", NULL);
-diff -up pioneers-0.12.2/docs/pioneers-meta-server.6.foo pioneers-0.12.2/docs/pioneers-meta-server.6
---- pioneers-0.12.2/docs/pioneers-meta-server.6.foo 2008-04-27 22:40:55.000000000 +0200
-+++ pioneers-0.12.2/docs/pioneers-meta-server.6 2008-09-07 17:01:15.000000000 +0200
-@@ -8,8 +8,10 @@ pioneers-meta-server \- meta game server
+--- ./docs/pioneers-meta-server.6.sanitize 2009-09-22 01:34:57.000000000 -0400
++++ ./docs/pioneers-meta-server.6 2011-07-29 09:47:15.982733045 -0400
+@@ -8,8 +8,10 @@
.SH DESCRIPTION
.B Pioneers
@@ -227,10 +50,17 @@ diff -up pioneers-0.12.2/docs/pioneers-meta-server.6.foo pioneers-0.12.2/docs/pi
provides a piece of network infrastructure that helps match pioneers clients to
pioneers servers. Casual players of pioneers probably do not need to run this
program.
-diff -up pioneers-0.12.2/docs/pioneers-server-console.6.foo pioneers-0.12.2/docs/pioneers-server-console.6
---- pioneers-0.12.2/docs/pioneers-server-console.6.foo 2007-12-16 20:10:31.000000000 +0100
-+++ pioneers-0.12.2/docs/pioneers-server-console.6 2008-09-07 17:01:15.000000000 +0200
-@@ -48,8 +48,9 @@ This manual page documents briefly the
+--- ./docs/pioneers.6.sanitize 2009-09-16 14:34:29.000000000 -0400
++++ ./docs/pioneers.6 2011-07-29 09:47:15.984733005 -0400
+@@ -1,6 +1,6 @@
+ .TH pioneers 6 "April 9, 2006" "pioneers"
+ .SH NAME
+-pioneers \- network implementation of Settlers of Catan
++pioneers \- Turnbased board strategy game (colonize an island)
+
+ .SH SYNOPSIS
+ .B pioneers
+@@ -24,8 +24,9 @@
command.
.PP
.B Pioneers
@@ -239,13 +69,12 @@ diff -up pioneers-0.12.2/docs/pioneers-server-console.6.foo pioneers-0.12.2/docs
+is a computerized version of a well known strategy board game. The
+goal of the game is to colonize an island. The players play the first
+colonists hence the name pioneers. It uses a client/server
- model for networked play of between two and eight players. This program
- provides a console-only server that \fBpioneers\fP clients can connect
- to.
-diff -up pioneers-0.12.2/docs/pioneers-server-gtk.6.foo pioneers-0.12.2/docs/pioneers-server-gtk.6
---- pioneers-0.12.2/docs/pioneers-server-gtk.6.foo 2007-12-16 20:10:31.000000000 +0100
-+++ pioneers-0.12.2/docs/pioneers-server-gtk.6 2008-09-07 17:01:15.000000000 +0200
-@@ -12,8 +12,9 @@ This manual page documents briefly the
+ model for networked play of between two and eight players. You will
+ need to connect to a machine running either \fBpioneers-server-gtk\fP
+ or \fBpioneers-server-console\fP to play. An AI client, \fBpioneersai\fP,
+--- ./docs/pioneers-server-console.6.sanitize 2008-05-04 12:58:54.000000000 -0400
++++ ./docs/pioneers-server-console.6 2011-07-29 09:47:15.983733025 -0400
+@@ -48,8 +48,9 @@
command.
.PP
.B Pioneers
@@ -255,20 +84,11 @@ diff -up pioneers-0.12.2/docs/pioneers-server-gtk.6.foo pioneers-0.12.2/docs/pio
+goal of the game is to colonize an island. The players play the first
+colonists hence the name pioneers. It uses a client/server
model for networked play of between two and eight players. This program
- provides a GUI-configurable stand-alone server which you connect to
- from
-diff -up pioneers-0.12.2/docs/pioneers.6.foo pioneers-0.12.2/docs/pioneers.6
---- pioneers-0.12.2/docs/pioneers.6.foo 2007-12-16 20:10:31.000000000 +0100
-+++ pioneers-0.12.2/docs/pioneers.6 2008-09-07 17:01:15.000000000 +0200
-@@ -1,6 +1,6 @@
- .TH pioneers 6 "April 9, 2006" "pioneers"
- .SH NAME
--pioneers \- network implementation of Settlers of Catan
-+pioneers \- Turnbased board strategy game (colonize an island)
-
- .SH SYNOPSIS
- .B pioneers
-@@ -24,8 +24,9 @@ This manual page documents briefly the
+ provides a console-only server that \fBpioneers\fP clients can connect
+ to.
+--- ./docs/pioneers-server-gtk.6.sanitize 2008-05-04 12:58:54.000000000 -0400
++++ ./docs/pioneers-server-gtk.6 2011-07-29 09:47:15.984733005 -0400
+@@ -12,8 +12,9 @@
command.
.PP
.B Pioneers
@@ -277,13 +97,12 @@ diff -up pioneers-0.12.2/docs/pioneers.6.foo pioneers-0.12.2/docs/pioneers.6
+is a computerized version of a well known strategy board game. The
+goal of the game is to colonize an island. The players play the first
+colonists hence the name pioneers. It uses a client/server
- model for networked play of between two and eight players. You will
- need to connect to a machine running either \fBpioneers-server-gtk\fP
- or \fBpioneers-server-console\fP to play. An AI client, \fBpioneersai\fP,
-diff -up pioneers-0.12.2/docs/pioneersai.6.foo pioneers-0.12.2/docs/pioneersai.6
---- pioneers-0.12.2/docs/pioneersai.6.foo 2007-12-16 20:10:31.000000000 +0100
-+++ pioneers-0.12.2/docs/pioneersai.6 2008-09-07 17:01:15.000000000 +0200
-@@ -26,8 +26,9 @@ This manual page documents briefly the
+ model for networked play of between two and eight players. This program
+ provides a GUI-configurable stand-alone server which you connect to
+ from
+--- ./docs/pioneersai.6.sanitize 2005-06-30 02:30:27.000000000 -0400
++++ ./docs/pioneersai.6 2011-07-29 09:47:15.984733005 -0400
+@@ -26,8 +26,9 @@
command.
.PP
.B Pioneers
@@ -295,191 +114,205 @@ diff -up pioneers-0.12.2/docs/pioneersai.6.foo pioneers-0.12.2/docs/pioneersai.6
implementation that can take part in Pioneers games.
.SH OPTIONS
-diff -up pioneers-0.12.2/po/af.po.foo pioneers-0.12.2/po/af.po
---- pioneers-0.12.2/po/af.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/af.po 2008-09-07 17:01:15.000000000 +0200
-@@ -2122,14 +2122,6 @@ msgid ""
+--- ./ChangeLog.sanitize 2011-01-26 07:46:22.000000000 -0500
++++ ./ChangeLog 2011-07-29 09:47:15.978733125 -0400
+@@ -4081,7 +4081,7 @@
+
+ 2001-03-09 Matt Waggoner <matt at waggoner.com>
+
+- * One of the official rule variants for Settlers of Catan is
++ * One of the official rule variants is
+ to disallow rolling a 7 on the first two rounds. This has been
+ added as a feature of gnocatan, as well as an additional variant:
+ always reroll 7s. These are accessed from the console server
+--- ./README.sanitize 2007-08-05 09:14:39.000000000 -0400
++++ ./README 2011-07-29 09:47:15.978733125 -0400
+@@ -1,8 +1,8 @@
+ Pioneers
+
+-Pioneers is an Internet playable implementation of the Settlers of
+-Catan board game. The aim is to remain as faithful to the board game
+-as is possible.
++Pioneers is a computerized version of a well known strategy board game. The
++goal of the game is to colonize an island. The players play the first
++colonists hence the name pioneers.
+
+ Playing the Game
+ ================
+--- ./po/pt.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/pt.po 2011-07-29 09:47:16.003732623 -0400
+@@ -2380,14 +2380,6 @@
+ "Maior bónus de descoberta de ilha: %d\n"
"Total: %d"
- msgstr ""
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"Pioniers is gebaseer op die uitstekende\n"
--"bordspel \"Settlers of Catan\".\n"
+-"Pioneers é baseado no excelente\n"
+-"jogo de tabuleiro 'Os Descobridores de Catan'.\n"
-
#: ../common/gtk/aboutbox.c:78
msgid "Version:"
- msgstr "Weergawe:"
-diff -up pioneers-0.12.2/po/cs.po.foo pioneers-0.12.2/po/cs.po
---- pioneers-0.12.2/po/cs.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/cs.po 2008-09-07 17:01:15.000000000 +0200
-@@ -2120,14 +2120,6 @@ msgstr ""
- "Maximální bonus za objevení ostrovů: %d\n"
- "Celkem: %d"
+ msgstr "Versão:"
+--- ./po/ja.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/ja.po 2011-07-29 09:47:16.000732683 -0400
+@@ -2383,14 +2383,6 @@
+ "最大島数発見ボーナス: %d\n"
+ "合計: %d"
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"Pioneers je založeno na skvělé\n"
--"deskové hře Osadníci z Katanu.\n"
+-"パイオニアは、カタンの植民 という\n"
+-"すばらしいボードゲームが元になっています.\n"
-
#: ../common/gtk/aboutbox.c:78
+ #, fuzzy
msgid "Version:"
- msgstr "Verze:"
-diff -up pioneers-0.12.2/po/da.po.foo pioneers-0.12.2/po/da.po
---- pioneers-0.12.2/po/da.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/da.po 2008-09-07 17:01:15.000000000 +0200
-@@ -2125,14 +2125,6 @@ msgstr ""
- "Maksimal bonus for opdagelse af øer: %d\n"
+--- ./po/af.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/af.po 2011-07-29 09:47:15.986732965 -0400
+@@ -2378,14 +2378,6 @@
"Total: %d"
+ msgstr ""
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"Pioneers er baseret på det fantastiske\n"
--"Settlers og Catan brædtspil.\n"
+-"Pioniers is gebaseer op die uitstekende\n"
+-"bordspel \"Settlers of Catan\".\n"
-
#: ../common/gtk/aboutbox.c:78
msgid "Version:"
- msgstr "Version:"
-diff -up pioneers-0.12.2/po/de.po.foo pioneers-0.12.2/po/de.po
---- pioneers-0.12.2/po/de.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/de.po 2008-09-07 17:01:16.000000000 +0200
-@@ -2134,14 +2134,6 @@ msgstr ""
- "Größter Insel-Entdeckungs-Bonus: %d\n"
- "Gesamt: %d"
+ msgstr "Weergawe:"
+--- ./po/hu.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/hu.po 2011-07-29 09:47:15.997732743 -0400
+@@ -2389,14 +2389,6 @@
+ "Maximum sziget felfedezés bónusz: %d\n"
+ "Összesen: %d"
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"Pioneers basiert auf dem exzellenten\n"
--"Brettspiel 'Die Siedler von Catan'.\n"
+-"A Pioneers a kíváló táblajáték a\n"
+-"Catan telepesei alapján készült.\n"
-
#: ../common/gtk/aboutbox.c:78
- #, fuzzy
msgid "Version:"
-diff -up pioneers-0.12.2/po/es.po.foo pioneers-0.12.2/po/es.po
---- pioneers-0.12.2/po/es.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/es.po 2008-09-07 17:01:16.000000000 +0200
-@@ -2126,14 +2126,6 @@ msgid ""
- "Total: %d"
- msgstr ""
+ msgstr "Verzió:"
+--- ./po/nl.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/nl.po 2011-07-29 09:47:16.001732663 -0400
+@@ -2380,14 +2380,6 @@
+ "Hoogste aantal ontdekkingspunten: %d\n"
+ "Totaal: %d"
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"Pioneers está basado en el excelente\n"
--"juego de mesa 'Los fundadores de Catán'.\n"
+-"Pioniers is gebaseerd op\n"
+-"het bordspel \"De kolonisten van Catan\".\n"
-
#: ../common/gtk/aboutbox.c:78
- #, fuzzy
msgid "Version:"
-diff -up pioneers-0.12.2/po/fr.po.foo pioneers-0.12.2/po/fr.po
---- pioneers-0.12.2/po/fr.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/fr.po 2008-09-07 17:01:16.000000000 +0200
-@@ -2135,14 +2135,6 @@ msgstr ""
- "Bonus maximum pour la découverte d'iles : %d\n"
- "Total : %d"
+ msgstr "Versie:"
+--- ./po/sv.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/sv.po 2011-07-29 09:47:16.005732583 -0400
+@@ -2389,14 +2389,6 @@
+ "Maximal upptäcktsbonus för öar: %d\n"
+ "Totalt: %d"
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"Pioneers est basé sur l'excellent\n"
--"jeu de plateau 'Les colons de Catane'.\n"
+-"Pioneers är baserad på det utmärkta\n"
+-"brädspelet Settlers of Catan.\n"
-
#: ../common/gtk/aboutbox.c:78
msgid "Version:"
- msgstr "Version :"
-diff -up pioneers-0.12.2/po/hu.po.foo pioneers-0.12.2/po/hu.po
---- pioneers-0.12.2/po/hu.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/hu.po 2008-09-07 17:01:16.000000000 +0200
-@@ -2134,14 +2134,6 @@ msgstr ""
- "Maximum sziget felfedezés bónusz: %d\n"
- "Összesen: %d"
+ msgstr "Version:"
+--- ./po/cs.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/cs.po 2011-07-29 09:47:15.988732925 -0400
+@@ -2374,14 +2374,6 @@
+ "Maximální bonus za objevení ostrovů: %d\n"
+ "Celkem: %d"
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"A Pioneers a kíváló táblajáték a\n"
--"Catan telepesei alapján készült.\n"
+-"Pioneers je založeno na skvělé\n"
+-"deskové hře Osadníci z Katanu.\n"
-
#: ../common/gtk/aboutbox.c:78
msgid "Version:"
- msgstr "Verzió:"
-diff -up pioneers-0.12.2/po/it.po.foo pioneers-0.12.2/po/it.po
---- pioneers-0.12.2/po/it.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/it.po 2008-09-07 17:01:16.000000000 +0200
-@@ -2127,14 +2127,6 @@ msgstr ""
- "Massimo bonus per scoperta isole: %d\n"
- "Totale: %d"
+ msgstr "Verze:"
+--- ./po/de.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/de.po 2011-07-29 09:47:15.991732865 -0400
+@@ -2383,14 +2383,6 @@
+ "Größter Insel-Entdeckungs-Bonus: %d\n"
+ "Gesamt: %d"
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"Pioneers è basato sull'eccellente gioco\n"
--"I Coloni di Catan.\n"
+-"Pioneers basiert auf dem exzellenten\n"
+-"Brettspiel 'Die Siedler von Catan'.\n"
-
#: ../common/gtk/aboutbox.c:78
msgid "Version:"
- msgstr "Versione:"
-diff -up pioneers-0.12.2/po/ja.po.foo pioneers-0.12.2/po/ja.po
---- pioneers-0.12.2/po/ja.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/ja.po 2008-09-07 17:01:16.000000000 +0200
-@@ -2125,14 +2125,6 @@ msgstr ""
- "最大島数発見ボーナス: %d\n"
- "合計: %d"
+ msgstr "Version:"
+--- ./po/fr.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/fr.po 2011-07-29 09:47:15.995732783 -0400
+@@ -2390,14 +2390,6 @@
+ "Bonus maximum pour la découverte d'iles : %d\n"
+ "Total : %d"
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"パイオニアは、カタンの植民 という\n"
--"すばらしいボードゲームが元になっています.\n"
+-"Pioneers est basé sur l'excellent\n"
+-"jeu de plateau 'Les colons de Catane'.\n"
-
#: ../common/gtk/aboutbox.c:78
- #, fuzzy
msgid "Version:"
-diff -up pioneers-0.12.2/po/nl.po.foo pioneers-0.12.2/po/nl.po
---- pioneers-0.12.2/po/nl.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/nl.po 2008-09-07 17:01:16.000000000 +0200
-@@ -2126,14 +2126,6 @@ msgstr ""
- "Hoogste aantal ontdekkingspunten: %d\n"
- "Totaal: %d"
+ msgstr "Version :"
+--- ./po/it.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/it.po 2011-07-29 09:47:15.998732723 -0400
+@@ -2380,14 +2380,6 @@
+ "Massimo bonus per scoperta isole: %d\n"
+ "Totale: %d"
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"Pioniers is gebaseerd op\n"
--"het bordspel \"De kolonisten van Catan\".\n"
+-"Pioneers è basato sull'eccellente gioco\n"
+-"I Coloni di Catan.\n"
-
#: ../common/gtk/aboutbox.c:78
msgid "Version:"
- msgstr "Versie:"
-diff -up pioneers-0.12.2/po/pt.po.foo pioneers-0.12.2/po/pt.po
---- pioneers-0.12.2/po/pt.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/pt.po 2008-09-07 17:01:16.000000000 +0200
-@@ -2121,14 +2121,6 @@ msgstr ""
- "Maior bónus de descoberta de ilha: %d\n"
+ msgstr "Versione:"
+--- ./po/es.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/es.po 2011-07-29 09:47:15.993732823 -0400
+@@ -2381,14 +2381,6 @@
+ "Bonificación máxima por descubrimiento de islas: %d\n"
"Total: %d"
-#: ../common/gtk/aboutbox.c:75
@@ -487,27 +320,176 @@ diff -up pioneers-0.12.2/po/pt.po.foo pioneers-0.12.2/po/pt.po
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"Pioneers é baseado no excelente\n"
--"jogo de tabuleiro 'Os Descobridores de Catan'.\n"
+-"Pioneers está basado en el excelente\n"
+-"juego de mesa 'Los fundadores de Catán'.\n"
-
#: ../common/gtk/aboutbox.c:78
msgid "Version:"
- msgstr "Versão:"
-diff -up pioneers-0.12.2/po/sv.po.foo pioneers-0.12.2/po/sv.po
---- pioneers-0.12.2/po/sv.po.foo 2008-05-01 20:50:15.000000000 +0200
-+++ pioneers-0.12.2/po/sv.po 2008-09-07 17:01:16.000000000 +0200
-@@ -2124,14 +2124,6 @@ msgstr ""
- "Maximal upptäcktsbonus för öar: %d\n"
- "Totalt: %d"
+ msgstr "Versión:"
+--- ./po/da.po.sanitize 2011-01-26 05:31:58.000000000 -0500
++++ ./po/da.po 2011-07-29 09:47:15.990732885 -0400
+@@ -2385,14 +2385,6 @@
+ "Maksimal bonus for opdagelse af øer: %d\n"
+ "Total: %d"
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
--"Pioneers är baserad på det utmärkta\n"
--"brädspelet Settlers of Catan.\n"
+-"Pioneers er baseret på det fantastiske\n"
+-"Settlers og Catan brædtspil.\n"
-
#: ../common/gtk/aboutbox.c:78
msgid "Version:"
msgstr "Version:"
+--- ./client/gtk/offline.c.sanitize 2010-10-07 12:15:15.000000000 -0400
++++ ./client/gtk/offline.c 2011-07-29 09:47:15.980733085 -0400
+@@ -89,7 +89,6 @@
+ && !connectable);
+ break;
+ case GUI_CONNECT_TRY:
+- gui_show_splash_page(FALSE, NULL);
+ gui_set_net_status(_("Connecting"));
+
+ connectable = FALSE;
+--- ./client/gtk/gui.c.sanitize 2010-10-26 11:24:09.000000000 -0400
++++ ./client/gtk/gui.c 2011-07-29 09:47:15.979733105 -0400
+@@ -55,14 +55,12 @@
+ TRADE_PAGE, /* trading interface */
+ QUOTE_PAGE, /* submit quotes page */
+ LEGEND_PAGE, /* legend */
+- SPLASH_PAGE /* splash screen */
+ };
+
+ static GtkWidget *map_notebook; /* map area panel */
+ static GtkWidget *trade_page; /* trade page in map area */
+ static GtkWidget *quote_page; /* quote page in map area */
+ static GtkWidget *legend_page; /* legend page in map area */
+-static GtkWidget *splash_page; /* splash page in map area */
+
+ static GtkWidget *develop_notebook; /* development card area panel */
+
+@@ -85,8 +83,6 @@
+
+ static GList *rules_callback_list = NULL;
+
+-#define PIONEERS_PIXMAP_SPLASH "pioneers/splash.png"
+-
+ static const gchar *pioneers_pixmaps[] = {
+ PIONEERS_PIXMAP_DICE,
+ PIONEERS_PIXMAP_TRADE,
+@@ -607,50 +603,6 @@
+ gtk_widget_hide(legend_page);
+ }
+
+-void gui_show_splash_page(gboolean show, GtkWidget * chat_widget)
+-{
+- static GtkWidget *widget = NULL;
+- if (chat_widget != NULL)
+- widget = chat_widget;
+- g_assert(widget != NULL);
+-
+- chat_set_grab_focus_on_update(TRUE);
+- if (show) {
+- gtk_widget_show(splash_page);
+- gtk_notebook_set_current_page(GTK_NOTEBOOK(map_notebook),
+- SPLASH_PAGE);
+- gtk_widget_hide(widget);
+- } else {
+- gtk_widget_hide(splash_page);
+- gtk_notebook_set_current_page(GTK_NOTEBOOK(map_notebook),
+- MAP_PAGE);
+- gtk_widget_show(widget);
+- }
+-}
+-
+-static GtkWidget *splash_build_page(void)
+-{
+- GtkWidget *pm;
+- GtkWidget *viewport;
+- gchar *filename;
+-
+- filename = g_build_filename(DATADIR, "pixmaps", "pioneers",
+- "splash.png", NULL);
+- pm = gtk_image_new_from_file(filename);
+- g_free(filename);
+-
+- /* The viewport avoids that the pixmap is drawn up into the tab area if
+- * it's too large for the space provided. */
+- viewport = gtk_viewport_new(NULL, NULL);
+- gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport),
+- GTK_SHADOW_NONE);
+- gtk_widget_show(viewport);
+- gtk_widget_set_size_request(pm, 1, 1);
+- gtk_widget_show(pm);
+- gtk_container_add(GTK_CONTAINER(viewport), pm);
+- return viewport;
+-}
+-
+ static GtkWidget *build_map_panel(void)
+ {
+ GtkWidget *lbl;
+@@ -716,13 +668,6 @@
+ gui_show_legend_page(FALSE);
+ theme_register_callback(G_CALLBACK(gui_theme_changed));
+
+- /* Tab page name, shown for the splash screen */
+- lbl = gtk_label_new(_("Welcome to Pioneers"));
+- gtk_widget_show(lbl);
+- splash_page = splash_build_page();
+- gtk_notebook_insert_page(GTK_NOTEBOOK(map_notebook),
+- splash_page, lbl, SPLASH_PAGE);
+-
+ return map_notebook;
+ }
+
+@@ -865,7 +810,6 @@
+ gtk_paned_pack1(GTK_PANED(vpaned), build_map_panel(), TRUE, TRUE);
+
+ chat_panel = gtk_vbox_new(FALSE, 0);
+- gui_show_splash_page(TRUE, chat_panel);
+
+ panel = chat_build_panel();
+ frontend_gui_register(panel, GUI_DISCONNECT, NULL);
+--- ./client/help/C/pioneers-C.omf.sanitize 2005-06-30 02:46:06.000000000 -0400
++++ ./client/help/C/pioneers-C.omf 2011-07-29 09:47:15.980733085 -0400
+@@ -17,8 +17,8 @@
+ <version identifier="1.0" date="2003-10-07" description="Updated to full OMF format"/>
+ <subject category="GNOME|Games"/>
+ <description>
+- Pioneers is an Internet playable implementation of
+- the Settlers of Catan board game.
++ Pioneers is a computerized version of a well known strategy board game.
++ The goal of the game is to colonize an island.
+ </description>
+ <type>
+ user's guide
+--- ./client/help/C/pioneers.xml.sanitize 2008-05-04 12:58:54.000000000 -0400
++++ ./client/help/C/pioneers.xml 2011-07-29 09:47:15.981733065 -0400
+@@ -58,10 +58,11 @@
+ <simplesect id="Authors">
+ <title>Authors and History</title>
+ <para>
+- Pioneers is a GNOME game based upon the board game Settlers of Catan
+- created by Mayfair Games. Pioneers was originally authored by Dave
+- Cole in the spring and summer of 1999, under the name Gnocatan.
+- Dave wanted to be able to
++ Pioneers is a computerized version of a well known strategy board game.
++ The goal of the game is to colonize an island. The players play the
++ first colonists hence the name pioneers.
++ Pioneers was originally authored by Dave Cole in the spring and summer
++ of 1999. Dave wanted to be able to
+ play the game without having to travel, so he developed a computer
+ implementation of the game. The Pioneers project stalled in the late
+ summer of 1999 and saw little development until the early spring of
+@@ -79,9 +80,6 @@
+ on the user interface.
+ </para>
+ <para>
+- In June 2005 the project was renamed from Gnocatan to Pioneers.
+- </para>
+- <para>
+ To be continued...
+ </para>
+ </simplesect>
diff --git a/pioneers.spec b/pioneers.spec
index 77dce73..8b0e676 100644
--- a/pioneers.spec
+++ b/pioneers.spec
@@ -1,12 +1,12 @@
Name: pioneers
-Version: 0.12.3
-Release: 3%{?dist}
+Version: 0.12.4
+Release: 1%{?dist}
Summary: Turnbased board strategy game (colonize an island)
Group: Amusements/Games
License: GPLv2+
URL: http://pio.sourceforge.net/
Source0: http://downloads.sourceforge.net/pio/%{name}-%{version}.tar.gz
-Patch0: pioneers-0.12.1-sanitize.patch
+Patch0: pioneers-0.12.4-sanitize.patch
Patch1: pioneers-0.12.3-dso.patch
Patch2: pioneers-0.12.2-namechange.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +113,9 @@ scrollkeeper-update -q || :
%changelog
+* Fri Jul 29 2011 Paul W. Frields <stickster at gmail.com> - 0.12.4-1
+- Update to upstream 0.12.4
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
diff --git a/sources b/sources
index 582e919..17c244c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-459e82043fd8e1042626eb3c0c4819f7 pioneers-0.12.3.tar.gz
+44717b9315f9a4f5a8651c467ae4822c pioneers-0.12.4.tar.gz
More information about the scm-commits
mailing list