rpms/pioneers/devel pioneers-0.12.1-sanitize.patch, 1.1, 1.2 pioneers.spec, 1.5, 1.6
Hans de Goede
jwrdegoede at fedoraproject.org
Sun Sep 7 15:02:35 UTC 2008
Author: jwrdegoede
Update of /cvs/pkgs/rpms/pioneers/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21742
Modified Files:
pioneers-0.12.1-sanitize.patch pioneers.spec
Log Message:
* Sun Sep 7 2008 Hans de Goede <hdegoede at redhat.com> 0.12.2-2
- Fix patch fuzz build failure
pioneers-0.12.1-sanitize.patch:
Index: pioneers-0.12.1-sanitize.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pioneers/devel/pioneers-0.12.1-sanitize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pioneers-0.12.1-sanitize.patch 28 Apr 2008 11:46:43 -0000 1.1
+++ pioneers-0.12.1-sanitize.patch 7 Sep 2008 15:02:05 -0000 1.2
@@ -1,12 +1,12 @@
-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 @@
+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.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
+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
@@ -19,9 +19,9 @@
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
+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 */
@@ -119,9 +119,9 @@
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
+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;
@@ -130,9 +130,9 @@
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
+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"/>
@@ -144,9 +144,9 @@
</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
+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>
@@ -173,9 +173,9 @@
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
+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
void aboutbox_display(const gchar * title, const gchar ** authors)
@@ -211,9 +211,9 @@
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
+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
.SH DESCRIPTION
@@ -227,9 +227,9 @@
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
+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
command.
.PP
@@ -242,9 +242,9 @@
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
+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
command.
.PP
@@ -257,9 +257,9 @@
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
+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
@@ -280,9 +280,9 @@
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
+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
command.
.PP
@@ -295,9 +295,9 @@
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
+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 ""
"Total: %d"
msgstr ""
@@ -313,9 +313,9 @@
#: ../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
+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"
@@ -331,10 +331,10 @@
#: ../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 ""
+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"
"Total: %d"
@@ -347,12 +347,12 @@
-"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 ""
+ 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"
@@ -367,9 +367,9 @@
#: ../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
+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 ""
@@ -385,9 +385,9 @@
#: ../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
+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"
@@ -403,9 +403,9 @@
#: ../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
+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"
@@ -421,9 +421,9 @@
#: ../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
+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"
@@ -439,9 +439,9 @@
#: ../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
+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"
@@ -457,9 +457,9 @@
#: ../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
+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"
@@ -475,10 +475,10 @@
#: ../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 ""
+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"
"Total: %d"
@@ -493,9 +493,9 @@
#: ../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
+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"
Index: pioneers.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pioneers/devel/pioneers.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pioneers.spec 2 May 2008 11:18:39 -0000 1.5
+++ pioneers.spec 7 Sep 2008 15:02:05 -0000 1.6
@@ -1,6 +1,6 @@
Name: pioneers
Version: 0.12.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Turnbased board strategy game (colonize an island)
Group: Amusements/Games
License: GPLv2+
@@ -109,6 +109,9 @@
%changelog
+* Sun Sep 7 2008 Hans de Goede <hdegoede at redhat.com> 0.12.2-2
+- Fix patch fuzz build failure
+
* Fri May 2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.12.2-1
- New upstream release 0.12.2
More information about the fedora-extras-commits
mailing list