commit b263d1b1d18504a1e188ee7825341d81654aed26
Author: Bruno Wolff III <bruno at wolff.to>
Date: Mon Jan 16 14:59:16 2012 -0600
Fix to build with gcc 4.7
unistd.h needs to be explicitly included now.
cyphesis-gcc47.patch | 10 ++++++++++
cyphesis.spec | 7 ++++++-
2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/cyphesis-gcc47.patch b/cyphesis-gcc47.patch
new file mode 100644
index 0000000..45e8b90
--- /dev/null
+++ b/cyphesis-gcc47.patch
@@ -0,0 +1,10 @@
+--- common/system.h.orig 2012-01-16 14:45:01.339140488 -0600
++++ common/system.h 2012-01-16 14:45:27.155421605 -0600
+@@ -20,6 +20,7 @@
+ #ifndef COMMON_SYSTEM_H
+ #define COMMON_SYSTEM_H
+
++#include <unistd.h>
+ #include <cstdlib>
+
+ // These two will not be transmitted to our parent, so we don't need to
diff --git a/cyphesis.spec b/cyphesis.spec
index 6370078..32840a9 100644
--- a/cyphesis.spec
+++ b/cyphesis.spec
@@ -4,7 +4,7 @@
Name: cyphesis
Version: 0.5.26
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: WorldForge game server
Group: System Environment/Libraries
License: GPLv2+
@@ -17,6 +17,7 @@ Source7: logwatch.shared.applycyphesisdate
Patch0: cyphesis-0.5.19-init.patch
Patch1: cyphesis-0.5.11-logdir.patch
Patch5: cyphesis-0.5.21-dso-linking.patch
+Patch6: cyphesis-gcc47.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
@@ -53,6 +54,7 @@ Logwatch scripts for the WorldForge game server.
%patch0 -p1
%patch1 -p0
%patch5 -p1 -b .dso.linking
+%patch6 -p0
chmod a-x rulesets/basic/mind/dictlist.py
chmod a-x rulesets/mason/world/objects/buildings/House.py
@@ -166,6 +168,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jan 16 2012 Bruno Wolff III <bruno at wolff.to> 0.5.26-4
+- Fix to build with gcc 4.7
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.26-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild