From 12c2b0ec414cadc9fc810eef5d46174436375c6d Mon Sep 17 00:00:00 2001
From: Alexey Torkhov <atorkhov@fedoraproject.org>
Date: Oct 05 2009 19:01:40 +0000
Subject: - Update to 0.5.21


---

diff --git a/.cvsignore b/.cvsignore
index 90921f8..69751a7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-cyphesis-0.5.20.tar.bz2
+cyphesis-0.5.21.tar.bz2
diff --git a/cyphesis-0.5.17-py26.patch b/cyphesis-0.5.17-py26.patch
deleted file mode 100644
index 48ccbc5..0000000
--- a/cyphesis-0.5.17-py26.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up cyphesis-0.5.17/configure.ac.py26 cyphesis-0.5.17/configure.ac
---- cyphesis-0.5.17/configure.ac.py26	2008-12-05 21:39:01.000000000 -0500
-+++ cyphesis-0.5.17/configure.ac	2008-12-05 21:44:01.000000000 -0500
-@@ -161,6 +161,11 @@ dnl
- dnl if found define HAVE_PYTHON_H
- dnl
- 
-+AC_CHECK_HEADER(python2.6/Python.h,
-+[
-+    python_include_path=-I${python_prefix}/include/python2.6
-+    python_version=2.6
-+],[
- AC_CHECK_HEADER(python2.5/Python.h,
- [
-     python_include_path=-I${python_prefix}/include/python2.5
-@@ -190,6 +195,7 @@ Python. If Python is installed somewhere
-         ])
-     ])
- ])
-+])
- 
- PYTHON_VERSION=${python_version}
- PYTHON_INCLUDES=${python_include_path}
diff --git a/cyphesis-0.5.20-gcc44.patch b/cyphesis-0.5.20-gcc44.patch
deleted file mode 100644
index 05925d1..0000000
--- a/cyphesis-0.5.20-gcc44.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/DateTimetest.cpp b/tests/DateTimetest.cpp
-index 0417349..2691c65 100644
---- a/tests/DateTimetest.cpp
-+++ b/tests/DateTimetest.cpp
-@@ -23,6 +23,8 @@
- 
- #include <cassert>
- 
-+#include <cstdio>
-+
- int main()
- {
-     DateTime datum(0);
diff --git a/cyphesis-0.5.21-gcc44.patch b/cyphesis-0.5.21-gcc44.patch
new file mode 100644
index 0000000..5c21695
--- /dev/null
+++ b/cyphesis-0.5.21-gcc44.patch
@@ -0,0 +1,19 @@
+commit 86068c36c2fa93053c6c2fd67d563c28daa00b12
+Author: Alistair Riddoch <alriddoch@googlemail.com>
+Date:   Sat Sep 12 19:19:41 2009 +0100
+
+    Add cassert to the code for avahi support.
+
+diff --git a/server/CommMDNSPublisher.cpp b/server/CommMDNSPublisher.cpp
+index a031973..76a5cf5 100644
+--- a/server/CommMDNSPublisher.cpp
++++ b/server/CommMDNSPublisher.cpp
+@@ -148,6 +148,8 @@ void CommMDNSPublisher::dispatch()
+ 
+ #include <avahi-common/error.h>
+ 
++#include <cassert>
++
+ static const bool debug_flag = false;
+ 
+ static void avahi_client_callback(AvahiClient * s,
diff --git a/cyphesis.spec b/cyphesis.spec
index afca701..7cd3626 100644
--- a/cyphesis.spec
+++ b/cyphesis.spec
@@ -3,8 +3,8 @@
 %define logwatch_scripts %{logwatch_root}/scripts
 
 Name:           cyphesis
-Version:        0.5.20
-Release:        2%{?dist}
+Version:        0.5.21
+Release:        1%{?dist}
 Summary:        WorldForge game server
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -16,8 +16,7 @@ Source6:        logwatch.serviceconf.cyphesis
 Source7:        logwatch.shared.applycyphesisdate
 Patch0:         cyphesis-0.5.19-init.patch
 Patch1:         cyphesis-0.5.11-logdir.patch
-Patch2:         cyphesis-0.5.20-gcc44.patch
-Patch5:         cyphesis-0.5.17-py26.patch
+Patch2:         cyphesis-0.5.21-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel libgcrypt-devel pkgconfig atlascpp-devel
 BuildRequires:  varconf-devel libsigc++20-devel mercator-devel skstream-devel
@@ -54,7 +53,6 @@ Logwatch scripts for the WorldForge game server.
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1 -b .gcc44
-%patch5 -p1 -b .py26
 
 chmod a-x rulesets/basic/mind/dictlist.py
 chmod a-x rulesets/mason/world/objects/buildings/House.py
@@ -167,6 +165,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Oct 05 2009 Alexey Torkhov <atorkhov@gmail.com> - 0.5.21-1
+- Update to 0.5.21
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.20-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index b775f24..0f565b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48fe22b8661d59698ffa417721086829  cyphesis-0.5.20.tar.bz2
+d2018813bfe827af7991075d799786e3  cyphesis-0.5.21.tar.bz2