From 87d6524847c2843f5d992c2b73723997905cd84ac82c03d9e33d48c9fa555662 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <prusnak@opensuse.org>
Date: Tue, 1 Mar 2011 17:45:25 +0000
Subject: [PATCH] Accepting request 63075 from
 home:AndreasStieger:branches:games

OBS-URL: https://build.opensuse.org/request/show/63075
OBS-URL: https://build.opensuse.org/package/show/games/freeciv?expand=0&rev=13
---
 freeciv-2.2.4.tar.bz2                          | 3 ---
 freeciv-2.2.5.tar.bz2                          | 3 +++
 freeciv-2.2.4-no-nb.diff => freeciv-no-nb.diff | 8 +++-----
 freeciv.changes                                | 5 +++++
 freeciv.spec                                   | 6 +++---
 5 files changed, 14 insertions(+), 11 deletions(-)
 delete mode 100644 freeciv-2.2.4.tar.bz2
 create mode 100644 freeciv-2.2.5.tar.bz2
 rename freeciv-2.2.4-no-nb.diff => freeciv-no-nb.diff (57%)

diff --git a/freeciv-2.2.4.tar.bz2 b/freeciv-2.2.4.tar.bz2
deleted file mode 100644
index 92e78ac..0000000
--- a/freeciv-2.2.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c997127dad5ed62f554c5d2cb0974ac9bb6c1133608fe07ef450042fffba8579
-size 34627702
diff --git a/freeciv-2.2.5.tar.bz2 b/freeciv-2.2.5.tar.bz2
new file mode 100644
index 0000000..2291e54
--- /dev/null
+++ b/freeciv-2.2.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9bd8bb20ae439d0cdfce8262fb44de33155c698cd15847bef32f8f28a9aad236
+size 35170438
diff --git a/freeciv-2.2.4-no-nb.diff b/freeciv-no-nb.diff
similarity index 57%
rename from freeciv-2.2.4-no-nb.diff
rename to freeciv-no-nb.diff
index 34eb528..e64e589 100644
--- a/freeciv-2.2.4-no-nb.diff
+++ b/freeciv-no-nb.diff
@@ -1,8 +1,6 @@
-Index: freeciv-2.2.1/configure.ac
-===================================================================
---- freeciv-2.2.1.orig/configure.ac
-+++ freeciv-2.2.1/configure.ac
-@@ -280,7 +280,7 @@ fi
+--- freeciv-2.2.5.orig/configure.ac	2011-02-28 22:05:54.000000000 +0000
++++ freeciv-2.2.5/configure.ac	2011-02-28 22:06:47.000000000 +0000
+@@ -282,7 +282,7 @@
  
  dnl I18n support
  ALL_LINGUAS="ar cs ca da de el en_GB eo es et fa fi fr he hu it ja ko lt 
diff --git a/freeciv.changes b/freeciv.changes
index 312196e..cbb4b0a 100644
--- a/freeciv.changes
+++ b/freeciv.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb 28 22:39:54 UTC 2011 - andreas.stieger@gmx.de
+
+- updated to upstream 2.2.5
+
 -------------------------------------------------------------------
 Tue Dec  7 22:56:42 UTC 2010 - andreas.stieger@gmx.de
 
diff --git a/freeciv.spec b/freeciv.spec
index f0759fd..d00643b 100644
--- a/freeciv.spec
+++ b/freeciv.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package freeciv (Version 2.2.4)
+# spec file for package freeciv (Version 2.2.5)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -27,7 +27,7 @@ License:        GPL v2 or later
 Group:          Amusements/Games/Strategy/Turn Based
 AutoReqProv:    on
 Summary:        Free Civilization Clone
-Version:        2.2.4
+Version:        2.2.5
 Release:        1
 Source0:        %{name}-%{version}.tar.bz2
 Source1:        freeciv.desktop
@@ -35,7 +35,7 @@ Source2:        freeciv.png
 Source3:        freeciv-manual
 Source4:        freeciv-manual.desktop
 Source5:        freeciv-manual.png
-Patch1:         freeciv-%{version}-no-nb.diff
+Patch1:         freeciv-no-nb.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description