From b3aa3e5f35e449091bc1693f284afd39a5dbbe20 Mon Sep 17 00:00:00 2001 From: Bruno Wolff III Date: Nov 20 2012 04:58:34 +0000 Subject: gcc 4.7 patch no longer needed --- diff --git a/cyphesis-gcc47.patch b/cyphesis-gcc47.patch deleted file mode 100644 index 45e8b90..0000000 --- a/cyphesis-gcc47.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - #include - - // These two will not be transmitted to our parent, so we don't need to diff --git a/cyphesis.spec b/cyphesis.spec index 435c8c0..aeafffd 100644 --- a/cyphesis.spec +++ b/cyphesis.spec @@ -18,7 +18,6 @@ Source8: cyphesis-tmpfiles.conf 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 @@ -55,7 +54,6 @@ 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