rpms/pioneers/devel pioneers-0.12.1-sanitize.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pioneers.spec, 1.2, 1.3 sources, 1.2, 1.3 pioneers-0.11.3-CVE2007-6010.patch, 1.1, NONE pioneers-0.11.3-sanitize.patch, 1.1, NONE

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Mon Apr 28 11:47:19 UTC 2008


Author: jwrdegoede

Update of /cvs/extras/rpms/pioneers/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv533

Modified Files:
	.cvsignore pioneers.spec sources 
Added Files:
	pioneers-0.12.1-sanitize.patch 
Removed Files:
	pioneers-0.11.3-CVE2007-6010.patch 
	pioneers-0.11.3-sanitize.patch 
Log Message:
* Mon Apr 28 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.12.1-1
- New upstream release 0.12.1


pioneers-0.12.1-sanitize.patch:

--- NEW FILE pioneers-0.12.1-sanitize.patch ---
diff -U0 pioneers-0.12.1/ChangeLog.sanitize pioneers-0.12.1/ChangeLog
--- pioneers-0.12.1/ChangeLog.sanitize	2008-04-27 23:00:50.000000000 +0200
+++ pioneers-0.12.1/ChangeLog	2008-04-28 13:13:30.000000000 +0200
@@ -3697 +3697 @@
-	* One of the official rule variants for Settlers of Catan is
+	* One of the official rule variants is
diff -up pioneers-0.12.1/README.sanitize pioneers-0.12.1/README
--- pioneers-0.12.1/README.sanitize	2007-12-16 20:10:47.000000000 +0100
+++ pioneers-0.12.1/README	2008-04-28 13:13:30.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.1/client/gtk/gui.c.sanitize pioneers-0.12.1/client/gtk/gui.c
--- pioneers-0.12.1/client/gtk/gui.c.sanitize	2008-04-27 22:40:58.000000000 +0200
+++ pioneers-0.12.1/client/gtk/gui.c	2008-04-28 13:13:30.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.1/client/gtk/offline.c.sanitize pioneers-0.12.1/client/gtk/offline.c
--- pioneers-0.12.1/client/gtk/offline.c.sanitize	2008-04-27 22:40:58.000000000 +0200
+++ pioneers-0.12.1/client/gtk/offline.c	2008-04-28 13:13:30.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.1/client/help/C/pioneers-C.omf.sanitize pioneers-0.12.1/client/help/C/pioneers-C.omf
--- pioneers-0.12.1/client/help/C/pioneers-C.omf.sanitize	2007-12-16 20:10:46.000000000 +0100
+++ pioneers-0.12.1/client/help/C/pioneers-C.omf	2008-04-28 13:13:30.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.1/client/help/C/pioneers.xml.sanitize pioneers-0.12.1/client/help/C/pioneers.xml
--- pioneers-0.12.1/client/help/C/pioneers.xml.sanitize	2008-04-27 22:40:58.000000000 +0200
+++ pioneers-0.12.1/client/help/C/pioneers.xml	2008-04-28 13:13:30.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.1/common/gtk/aboutbox.c.sanitize pioneers-0.12.1/common/gtk/aboutbox.c
--- pioneers-0.12.1/common/gtk/aboutbox.c.sanitize	2008-04-27 22:40:55.000000000 +0200
+++ pioneers-0.12.1/common/gtk/aboutbox.c	2008-04-28 13:13:30.000000000 +0200
@@ -37,10 +37,9 @@ static GtkWidget *about = NULL;	/* The a
 
 void aboutbox_display(const gchar * title, const gchar ** authors)
 {
-	GtkWidget *splash = NULL, *view = NULL;
+	GtkWidget *view = NULL;
 	GtkTextBuffer *buffer = NULL;
 	GtkTextIter iter;
-	gchar *imagefile = NULL;
 	gint i;
 
 	if (about != NULL) {
@@ -58,22 +57,11 @@ void aboutbox_display(const gchar * titl
 	g_signal_connect(G_OBJECT(about), "destroy",
 			 G_CALLBACK(gtk_widget_destroyed), &about);
 
-	imagefile = g_build_filename(DATADIR, "pixmaps", "pioneers",
-				     "splash.png", NULL);
-	splash = gtk_image_new_from_file(imagefile);
-	g_free(imagefile);
-
-	gtk_box_pack_start(GTK_BOX(GTK_DIALOG(about)->vbox), splash, FALSE,
-			   FALSE, 0);
-
 	buffer = gtk_text_buffer_new(NULL);
 	gtk_text_buffer_get_start_iter(buffer, &iter);
 	gtk_text_buffer_create_tag(buffer, "bold",
 				   "weight", PANGO_WEIGHT_BOLD, NULL);
 
-	gtk_text_buffer_insert(buffer, &iter,
-			       _("Pioneers is based upon the excellent\n"
-				 "Settlers of Catan board game.\n"), -1);
 	gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
 						 _("Version:"), -1,
 						 "bold", NULL);
diff -up pioneers-0.12.1/docs/pioneers-meta-server.6.sanitize pioneers-0.12.1/docs/pioneers-meta-server.6
--- pioneers-0.12.1/docs/pioneers-meta-server.6.sanitize	2008-04-27 22:40:55.000000000 +0200
+++ pioneers-0.12.1/docs/pioneers-meta-server.6	2008-04-28 13:13:30.000000000 +0200
@@ -8,8 +8,10 @@ pioneers-meta-server \- meta game server
 
 .SH DESCRIPTION
 .B Pioneers
-is an implementation of the popular, award-winning "Settlers of Catan"
-board game.  It uses a client/server model for networked play. This program
+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. This program
 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.1/docs/pioneers-server-console.6.sanitize pioneers-0.12.1/docs/pioneers-server-console.6
--- pioneers-0.12.1/docs/pioneers-server-console.6.sanitize	2007-12-16 20:10:31.000000000 +0100
+++ pioneers-0.12.1/docs/pioneers-server-console.6	2008-04-28 13:13:30.000000000 +0200
@@ -48,8 +48,9 @@ This manual page documents briefly the
 command.
 .PP
 .B Pioneers
-is an implementation of the popular, award-winning "Settlers of Catan"
-board game for the GNOME desktop environment.  It uses a client/server
+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.1/docs/pioneers-server-gtk.6.sanitize pioneers-0.12.1/docs/pioneers-server-gtk.6
--- pioneers-0.12.1/docs/pioneers-server-gtk.6.sanitize	2007-12-16 20:10:31.000000000 +0100
+++ pioneers-0.12.1/docs/pioneers-server-gtk.6	2008-04-28 13:13:30.000000000 +0200
@@ -12,8 +12,9 @@ This manual page documents briefly the
 command.
 .PP
 .B Pioneers
-is an implementation of the popular, award-winning "Settlers of Catan"
-board game for the GNOME desktop environment.  It uses a client/server
+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 GUI-configurable stand-alone server which you connect to
 from 
diff -up pioneers-0.12.1/docs/pioneers.6.sanitize pioneers-0.12.1/docs/pioneers.6
--- pioneers-0.12.1/docs/pioneers.6.sanitize	2007-12-16 20:10:31.000000000 +0100
+++ pioneers-0.12.1/docs/pioneers.6	2008-04-28 13:13:30.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
 command.
 .PP
 .B Pioneers
-is an implementation of the popular, award-winning "Settlers of Catan"
-board game for the GNOME desktop environment.  It uses a client/server
+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.1/docs/pioneersai.6.sanitize pioneers-0.12.1/docs/pioneersai.6
--- pioneers-0.12.1/docs/pioneersai.6.sanitize	2007-12-16 20:10:31.000000000 +0100
+++ pioneers-0.12.1/docs/pioneersai.6	2008-04-28 13:13:30.000000000 +0200
@@ -26,8 +26,9 @@ This manual page documents briefly the
 command.
 .PP
 .B Pioneers
-is an emulation of the Settlers of Catan board game which can
-be played over the internet. This is an AI player
+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. This is an AI player
 implementation that can take part in Pioneers games.
 
 .SH OPTIONS
diff -up pioneers-0.12.1/po/af.po.sanitize pioneers-0.12.1/po/af.po
--- pioneers-0.12.1/po/af.po.sanitize	2008-04-27 22:41:06.000000000 +0200
+++ pioneers-0.12.1/po/af.po	2008-04-28 13:13:30.000000000 +0200
@@ -2122,14 +2122,6 @@ msgid ""
 "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"
-
 #: ../common/gtk/aboutbox.c:78
 msgid "Version:"
 msgstr "Weergawe:"
diff -up pioneers-0.12.1/po/cs.po.sanitize pioneers-0.12.1/po/cs.po
--- pioneers-0.12.1/po/cs.po.sanitize	2008-04-28 13:15:17.000000000 +0200
+++ pioneers-0.12.1/po/cs.po	2008-04-28 13:15:33.000000000 +0200
@@ -2120,14 +2120,6 @@ msgstr ""
 "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 ""
-"Pioneers je založeno na skvělé\n"
-"deskové hře Osadníci z Katanu.\n"
-
 #: ../common/gtk/aboutbox.c:78
 msgid "Version:"
 msgstr "Verze:"
diff -up pioneers-0.12.1/po/da.po.sanitize pioneers-0.12.1/po/da.po
--- pioneers-0.12.1/po/da.po.sanitize	2008-04-27 22:41:07.000000000 +0200
+++ pioneers-0.12.1/po/da.po	2008-04-28 13:13:30.000000000 +0200
@@ -2128,14 +2128,6 @@ msgstr ""
 "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 er baseret på det fantastiske\n"
-"Settlers og Catan brædtspil.\n"
-
 #: ../common/gtk/aboutbox.c:78
 #, fuzzy
 msgid "Version:"
diff -up pioneers-0.12.1/po/de.po.sanitize pioneers-0.12.1/po/de.po
--- pioneers-0.12.1/po/de.po.sanitize	2008-04-27 22:41:07.000000000 +0200
+++ pioneers-0.12.1/po/de.po	2008-04-28 13:13:30.000000000 +0200
@@ -2132,14 +2132,6 @@ msgstr ""
 "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 basiert auf dem exzellenten\n"
-"Brettspiel 'Die Siedler von Catan'.\n"
-
 #: ../common/gtk/aboutbox.c:78
 #, fuzzy
 msgid "Version:"
diff -up pioneers-0.12.1/po/es.po.sanitize pioneers-0.12.1/po/es.po
--- pioneers-0.12.1/po/es.po.sanitize	2008-04-27 22:41:07.000000000 +0200
+++ pioneers-0.12.1/po/es.po	2008-04-28 13:13:30.000000000 +0200
@@ -2126,14 +2126,6 @@ msgid ""
 "Total: %d"
 msgstr ""
 
-#: ../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"
-
 #: ../common/gtk/aboutbox.c:78
 #, fuzzy
 msgid "Version:"
diff -up pioneers-0.12.1/po/fr.po.sanitize pioneers-0.12.1/po/fr.po
--- pioneers-0.12.1/po/fr.po.sanitize	2008-04-27 22:41:07.000000000 +0200
+++ pioneers-0.12.1/po/fr.po	2008-04-28 13:13:30.000000000 +0200
@@ -2135,14 +2135,6 @@ msgstr ""
 "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 ""
-"Pioneers est basé sur l'excellent\n"
-"jeu de plateau 'Les colons de Catan'.\n"
-
 #: ../common/gtk/aboutbox.c:78
 msgid "Version:"
 msgstr "Version :"
diff -up pioneers-0.12.1/po/hu.po.sanitize pioneers-0.12.1/po/hu.po
--- pioneers-0.12.1/po/hu.po.sanitize	2008-04-27 22:41:08.000000000 +0200
+++ pioneers-0.12.1/po/hu.po	2008-04-28 13:13:30.000000000 +0200
@@ -2134,14 +2134,6 @@ msgstr ""
 "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 ""
-"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
 msgid "Version:"
 msgstr "Verzió:"
diff -up pioneers-0.12.1/po/it.po.sanitize pioneers-0.12.1/po/it.po
--- pioneers-0.12.1/po/it.po.sanitize	2008-04-27 22:41:08.000000000 +0200
+++ pioneers-0.12.1/po/it.po	2008-04-28 13:13:30.000000000 +0200
@@ -2127,14 +2127,6 @@ msgstr ""
 "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 ""
-"Pioneers è basato sull'eccellente gioco\n"
-"I Coloni di Catan.\n"
-
 #: ../common/gtk/aboutbox.c:78
 msgid "Version:"
 msgstr "Versione:"
diff -up pioneers-0.12.1/po/ja.po.sanitize pioneers-0.12.1/po/ja.po
--- pioneers-0.12.1/po/ja.po.sanitize	2008-04-27 22:41:08.000000000 +0200
+++ pioneers-0.12.1/po/ja.po	2008-04-28 13:13:30.000000000 +0200
@@ -2125,14 +2125,6 @@ msgstr ""
 "最大島数発見ボーナス: %d\n"
 "合計: %d"
 
-#: ../common/gtk/aboutbox.c:75
-msgid ""
-"Pioneers is based upon the excellent\n"
-"Settlers of Catan board game.\n"
-msgstr ""
-"パイオニアは、カタンの植民 という\n"
-"すばらしいボードゲームが元になっています.\n"
-
 #: ../common/gtk/aboutbox.c:78
 #, fuzzy
 msgid "Version:"
diff -up pioneers-0.12.1/po/nl.po.sanitize pioneers-0.12.1/po/nl.po
--- pioneers-0.12.1/po/nl.po.sanitize	2008-04-27 22:41:08.000000000 +0200
+++ pioneers-0.12.1/po/nl.po	2008-04-28 13:13:30.000000000 +0200
@@ -2126,14 +2126,6 @@ msgstr ""
 "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 ""
-"Pioniers is gebaseerd op\n"
-"het bordspel \"De kolonisten van Catan\".\n"
-
 #: ../common/gtk/aboutbox.c:78
 msgid "Version:"
 msgstr "Versie:"
diff -up pioneers-0.12.1/po/pt.po.sanitize pioneers-0.12.1/po/pt.po
--- pioneers-0.12.1/po/pt.po.sanitize	2008-04-27 22:41:08.000000000 +0200
+++ pioneers-0.12.1/po/pt.po	2008-04-28 13:13:30.000000000 +0200
@@ -2123,14 +2123,6 @@ msgstr ""
 "Maior bónus de descoberta de ilha: %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 é baseado no excelente\n"
-"jogo de tabuleiro 'Os Descobridores de Catan'.\n"
-
 #: ../common/gtk/aboutbox.c:78
 msgid "Version:"
 msgstr "Versão:"
diff -up pioneers-0.12.1/po/sv.po.sanitize pioneers-0.12.1/po/sv.po
--- pioneers-0.12.1/po/sv.po.sanitize	2008-04-27 22:41:09.000000000 +0200
+++ pioneers-0.12.1/po/sv.po	2008-04-28 13:13:30.000000000 +0200
@@ -2124,14 +2124,6 @@ msgstr ""
 "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 är baserad på det utmärkta\n"
-"brädspelet Settlers of Catan.\n"
-
 #: ../common/gtk/aboutbox.c:78
 msgid "Version:"
 msgstr "Version:"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pioneers/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Dec 2007 13:41:45 -0000	1.2
+++ .cvsignore	28 Apr 2008 11:46:43 -0000	1.3
@@ -1 +1 @@
-pioneers-0.11.3.tar.gz
+pioneers-0.12.1.tar.gz


Index: pioneers.spec
===================================================================
RCS file: /cvs/extras/rpms/pioneers/devel/pioneers.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pioneers.spec	13 Feb 2008 21:03:16 -0000	1.2
+++ pioneers.spec	28 Apr 2008 11:46:43 -0000	1.3
@@ -1,13 +1,12 @@
 Name:           pioneers
-Version:        0.11.3
-Release:        4%{?dist}
+Version:        0.12.1
+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.11.3-sanitize.patch
-Patch1:         pioneers-0.11.3-CVE2007-6010.patch
+Patch0:         pioneers-0.12.1-sanitize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnome-devel gtk2-devel gettext scrollkeeper
 BuildRequires:  desktop-file-utils
@@ -40,9 +39,8 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p2
-
+%patch0 -p1 -z .sanitize
+	
 
 %build
 # pioneers uses some GNU extensions
@@ -111,6 +109,9 @@
 
 
 %changelog
+* Mon Apr 28 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.12.1-1
+- New upstream release 0.12.1
+
 * Wed Feb 13 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.11.3-4
 - Fix building with latest glibc
 - Rebuild for gcc-4.3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pioneers/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Dec 2007 13:41:45 -0000	1.2
+++ sources	28 Apr 2008 11:46:43 -0000	1.3
@@ -1 +1 @@
-b9184fb30f3fb04d3d010628a2a12b52  pioneers-0.11.3.tar.gz
+b0e5684724457deb0b4abe75fc5c2158  pioneers-0.12.1.tar.gz


--- pioneers-0.11.3-CVE2007-6010.patch DELETED ---


--- pioneers-0.11.3-sanitize.patch DELETED ---




More information about the scm-commits mailing list