From 970ba00ab91175d60fcf5848fe099d8c59465e4b Mon Sep 17 00:00:00 2001
From: Brian Pepple <bpepple@fedoraproject.org>
Date: Feb 13 2007 21:03:13 +0000
Subject: - Update to 2.0.9.

- Drop button patch, fixed upstream.
- Drop security patch, fixed upstream.
- Drop X-Fedora category from desktop files.

---

diff --git a/.cvsignore b/.cvsignore
index ed615db..44757dd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-freeciv-2.0.8.tar.bz2
+freeciv-2.0.9.tar.bz2
 stdsounds3.tar.gz
diff --git a/freeciv-button-style.patch b/freeciv-button-style.patch
deleted file mode 100644
index bfc1eac..0000000
--- a/freeciv-button-style.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur freeciv-2.0.8.OLD/client/gui-gtk-2.0/gui_main.c freeciv-2.0.8/client/gui-gtk-2.0/gui_main.c
---- freeciv-2.0.8.OLD/client/gui-gtk-2.0/gui_main.c	2005-12-26 17:53:53.000000000 -0500
-+++ freeciv-2.0.8/client/gui-gtk-2.0/gui_main.c	2006-08-01 14:34:54.000000000 -0400
-@@ -853,7 +853,7 @@
-   if (!(style = gtk_rc_get_style(turn_done_button))) {
-     style = turn_done_button->style;
-   }
--  gtk_widget_set_style(turn_done_button, gtk_style_copy(style));
-+  gtk_widget_modify_style(turn_done_button, gtk_style_copy(style));
- 
-   gtk_table_attach_defaults(GTK_TABLE(table), turn_done_button, 0, 10, 2, 3);
- 
diff --git a/freeciv-security.patch b/freeciv-security.patch
deleted file mode 100644
index f2ed4e0..0000000
--- a/freeciv-security.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur freeciv-2.0.8.OLD/common/packets.c freeciv-2.0.8/common/packets.c
---- freeciv-2.0.8.OLD/common/packets.c	2006-03-05 22:35:23.000000000 -0500
-+++ freeciv-2.0.8/common/packets.c	2006-08-02 18:27:40.000000000 -0400
-@@ -577,8 +577,11 @@
- 	  chunk->total_length, chunk->chunk_length);
- 
-   if (chunk->total_length < 0
-+      || chunk->chunk_length < 0
-       || chunk->total_length >= MAX_ATTRIBUTE_BLOCK
-       || chunk->offset < 0
-+      || chunk->offset > chunk->total_length /* necessary check on 32 bit systems */
-+      || chunk->chunk_length > chunk->total_length
-       || chunk->offset + chunk->chunk_length > chunk->total_length
-       || (chunk->offset != 0
-           && chunk->total_length != pplayer->attribute_block_buffer.length)) {
-diff -ur freeciv-2.0.8.OLD/server/unithand.c freeciv-2.0.8/server/unithand.c
---- freeciv-2.0.8.OLD/server/unithand.c	2005-12-26 16:37:53.000000000 -0500
-+++ freeciv-2.0.8/server/unithand.c	2006-08-02 18:26:15.000000000 -0400
-@@ -1593,7 +1593,8 @@
-   struct unit *punit = player_find_unit_by_id(pplayer, packet->unit_id);
-   int i;
- 
--  if (!punit || packet->length < 0 || punit->activity != ACTIVITY_IDLE) {
-+  if (!punit || packet->length < 0 || punit->activity != ACTIVITY_IDLE
-+      || packet->length > MAX_LEN_ROUTE) {
-     return;
-   }
- 
diff --git a/freeciv.spec b/freeciv.spec
index 6003f61..e725aaf 100644
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -1,6 +1,6 @@
 Name:           freeciv
-Version:        2.0.8
-Release:        7%{?dist}
+Version:        2.0.9
+Release:        1%{?dist}
 Summary:        The Freeciv multi-player strategy game
 
 Group:          Amusements/Games
@@ -12,8 +12,6 @@ Source2:	%{name}-server.desktop
 Source3:	%{name}.xpm
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-aifill.patch
-Patch3:		%{name}-security.patch
-Patch4:		%{name}-button-style.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -39,8 +37,6 @@ in order to become the leader of the greatest civilization.
 %setup -q -n %{name}-%{version}
 %patch1 -p1 -b .desktop
 %patch2 -p0 -b .aifill
-%patch3 -p1 -b .security
-%patch4 -p1 -b .button
 
 
 %build
@@ -57,14 +53,12 @@ desktop-file-install --vendor fedora --delete-original	\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications	\
 	--remove-category=Strategy			\
 	--add-category=StrategyGame			\
-	--add-category X-Fedora				\
 	$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
 desktop-file-install --vendor fedora			\
 	--dir $RPM_BUILD_ROOT%{_datadir}/applications  	\
 	--remove-category=Strategy			\
 	--add-category=StrategyGame			\
-	--add-category X-Fedora			        \
 	%{SOURCE2}
 
 # Remove civmanual
@@ -101,6 +95,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 13 2007 Brian Pepple <bpepple@fedoraproject.org> - 2.0.9-1
+- Update to 2.0.9.
+- Drop button patch, fixed upstream.
+- Drop security patch, fixed upstream.
+- Drop X-Fedora category from desktop files.
+
 * Thu Sep  7 2006 Brian Pepple <bpepple@fedoraproject.org> - 2.0.8-7
 - Rebuild for FC6.
 
diff --git a/sources b/sources
index ce6dbc5..c32b0de 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9ebd5899c2c78362e0e2c68791673a88  freeciv-2.0.8.tar.bz2
+7bfa40220bd8e19a263ca247202682ce  freeciv-2.0.9.tar.bz2
 77215914712f2f351092918f5e41e39e  stdsounds3.tar.gz