rpms/cyphesis/devel cyphesis-0.5.15-gcc43.patch, NONE, 1.1 cyphesis.spec, 1.16, 1.17

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/cyphesis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26827

Modified Files:
	cyphesis.spec 
Added Files:
	cyphesis-0.5.15-gcc43.patch 
Log Message:
Add patch for building with gcc 4.3
Add code to load game rules after an upgrade



cyphesis-0.5.15-gcc43.patch:

--- NEW FILE cyphesis-0.5.15-gcc43.patch ---
--- cyphesis-0.5.15/modules/DateTime.cpp.orig	2008-02-10 17:10:55.000000000 -0800
+++ cyphesis-0.5.15/modules/DateTime.cpp	2008-02-10 17:11:09.000000000 -0800
@@ -20,6 +20,7 @@
 #include "DateTime.h"
 
 #include <stdio.h>
+#include <cstdlib>
 
 // date_pat=re.compile("^|[-:]|\s+");
 
--- cyphesis-0.5.15/common/Database.cpp.orig	2008-02-10 16:11:37.000000000 -0800
+++ cyphesis-0.5.15/common/Database.cpp	2008-02-10 16:22:51.000000000 -0800
@@ -33,6 +33,8 @@
 
 #include <iostream>
 #include <sstream>
+#include <cstdlib>
+#include <cstring>
 
 #include <cassert>
 
--- cyphesis-0.5.15/common/log.cpp.orig	2008-02-10 16:12:42.000000000 -0800
+++ cyphesis-0.5.15/common/log.cpp	2008-02-10 16:12:56.000000000 -0800
@@ -27,6 +27,7 @@
 
 #include <iostream>
 #include <fstream>
+#include <cstring>
 
 extern "C" {
 #ifdef HAVE_SYSLOG_H
--- cyphesis-0.5.15/common/types.h.orig	2008-02-10 16:57:06.000000000 -0800
+++ cyphesis-0.5.15/common/types.h	2008-02-10 16:41:16.000000000 -0800
@@ -25,6 +25,7 @@
 #include <set>
 #include <map>
 #include <vector>
+#include <string>
 
 class BaseEntity;
 class Entity;
--- cyphesis-0.5.15/common/globals.cpp.orig	2008-02-10 16:23:25.000000000 -0800
+++ cyphesis-0.5.15/common/globals.cpp	2008-02-10 16:23:34.000000000 -0800
@@ -37,6 +37,7 @@
 #include <sys/stat.h>
 
 #include <cassert>
+#include <cstring>
 
 const char * CYPHESIS = "cyphesis";
 const char * CLIENT = "client";
--- cyphesis-0.5.15/common/id.cpp.orig	2008-02-10 16:04:31.000000000 -0800
+++ cyphesis-0.5.15/common/id.cpp	2008-02-10 16:34:16.000000000 -0800
@@ -22,6 +22,8 @@
 #include "common/compose.hpp"
 
 #include <cassert>
+#include <cstring>
+#include <cstdlib>
 
 long integerId(const std::string & id)
 {
--- cyphesis-0.5.15/rulesets/Container.h.orig	2008-02-10 17:18:48.000000000 -0800
+++ cyphesis-0.5.15/rulesets/Container.h	2008-02-10 17:19:19.000000000 -0800
@@ -25,6 +25,7 @@
 #include <set>
 #include <map>
 #include <vector>
+#include <string>
 
 class Entity;
 


Index: cyphesis.spec
===================================================================
RCS file: /cvs/extras/rpms/cyphesis/devel/cyphesis.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cyphesis.spec	21 Dec 2007 16:22:39 -0000	1.16
+++ cyphesis.spec	11 Feb 2008 02:13:10 -0000	1.17
@@ -7,7 +7,7 @@
 
 Name:           cyphesis
 Version:        0.5.15
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        WorldForge game server
 Group:          System Environment/Libraries
 # Would be GPLv2+, except server/protocol_instructions.h is GPLv2 only.
@@ -23,6 +23,7 @@
 Source7:        logwatch.shared.applycyphesisdate
 Patch0:         cyphesis-0.5.15-init.patch
 Patch1:         cyphesis-0.5.11-logdir.patch
+Patch2:         cyphesis-0.5.15-gcc43.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
@@ -70,6 +71,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 # Fix a bug where DESTDIR is added twice to some files during the
 # install step.  Upstream has been notified.
@@ -87,6 +89,13 @@
 # init.d script for both starting cyphesis and populating the world.
 echo "POPULATE_WORLD=1" >> cyphesis.sysconfig
 
+# Use a /etc/sysconfig/cyphesis variable to determine if
+# we should load the rules into the cyphesis server
+# via cyloadrules or not.  This flag will be reset by the
+# rpm whenever the game rules have changed and need to be reloaded
+# after an upgrade/install.
+echo "LOAD_RULES=1" >> cyphesis.sysconfig
+
 
 %build
 %configure
@@ -149,6 +158,13 @@
 
 %post
 /sbin/chkconfig --add cyphesis
+# Make sure any new game rules are loaded into the database after
+# an install or upgrade.
+if ! grep -q LOAD_RULES %{_sysconfdir}/%{name} ; then
+    sed -i -e 's/LOAD_RULES=.*/LOAD_RULES=1/' %{_sysconfdir}/sysconfig/%{name} 
+else
+    echo "LOAD_RULES=1" >> %{_sysconfdir}/sysconfig/%{name}
+fi
 
 %post selinux
 # Install SELinux policy modules
@@ -232,6 +248,11 @@
 
 
 %changelog
+* Sun Feb 10 2008 Wart <wart at kobold.org> 0.5.15-4
+- Rebuild for gcc 4.3
+- Add 'LOAD_RULES' setting in /etc/sysconfig/cyphesis to control
+  reloading of the game rules data.
+
 * Tue Dec 18 2007 Wart <wart at kobold.org> 0.5.15-3
 - Fix selinux permissions so that cyphesis can create its own
   log file.