[crossfire] 1.60.0.

[Jon Ciesla]

commit 77fe6876a97b39fdc77970dca661a944d107d8bd
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jan 12 08:12:39 2012 -0600

    1.60.0.

 .gitignore                  |    2 ++
 crossfire-1.11.0-curl.patch |   11 +++++++++++
 crossfire.spec              |   18 ++++++++++++------
 sources                     |    4 ++--
 4 files changed, 27 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 849af4c..386da0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 crossfire-1.11.0.tar.gz
 crossfire-1.11.0.arch.tar.gz
+/crossfire-1.60.0.arch.tar.gz
+/crossfire-1.60.0.tar.gz
diff --git a/crossfire-1.11.0-curl.patch b/crossfire-1.11.0-curl.patch
new file mode 100644
index 0000000..282fd8f
--- /dev/null
+++ b/crossfire-1.11.0-curl.patch
@@ -0,0 +1,11 @@
+--- socket/metaserver.c~	2008-01-29 01:29:05.000000000 -0600
++++ socket/metaserver.c	2012-01-11 09:49:12.231215494 -0600
+@@ -47,7 +47,7 @@
+ 
+ #ifdef HAVE_CURL_CURL_H
+ #include <curl/curl.h>
+-#include <curl/types.h>
++//#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+ 
diff --git a/crossfire.spec b/crossfire.spec
index 58dd8b4..35b3b6a 100644
--- a/crossfire.spec
+++ b/crossfire.spec
@@ -7,8 +7,8 @@
 %define logwatch_scripts %{logwatch_root}/scripts
 
 Name: crossfire
-Version: 1.11.0
-Release: 5%{?dist}
+Version: 1.60.0
+Release: 1%{?dist}
 Summary: Server for hosting crossfire games
 Group: Amusements/Games
 # All files GPLv2+ except server/daemon.c which also has MIT attributions
@@ -25,7 +25,8 @@ Source7: crossfire.if
 Source8: logwatch.logconf.crossfire
 Source9: logwatch.script.crossfire
 Source10: logwatch.serviceconf.crossfire
-Patch0:  crossfire-1.10.0-log-login.patch
+#Patch0:  crossfire-1.10.0-log-login.patch
+Patch1:  crossfire-1.11.0-curl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       crossfire-maps
 BuildRequires:  checkpolicy selinux-policy-devel hardlink
@@ -103,7 +104,8 @@ logwatch scripts for the Crossfire game server
 %prep
 %setup -q
 %setup -q -a 1
-%patch0 -p0
+#%patch0 -p0
+%patch1 -p0
 mkdir SELinux
 cp  %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux
 
@@ -275,8 +277,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/crossedit
-%{_bindir}/crossfire
+#%%{_bindir}/crossedit
+#%%{_bindir}/crossfire
+%{_bindir}/crossfire-server
 %{_bindir}/crossloop
 %{_bindir}/cross_random_map
 %{_datadir}/%{name}
@@ -330,6 +333,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jan 11 2012 Jon Ciesla <limburgher at gmail.com> - 1.60.0-1
+- New upstream.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.11.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 080742a..d6ceeb2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4c2e8f60ca57fb140808d07e62b072a9  crossfire-1.11.0.tar.gz
-cba07d6d4ec61e1b08d2bf1c88e8821c  crossfire-1.11.0.arch.tar.gz
+36dbbb5ac9a4b82be2aff9ac803f73bd  crossfire-1.60.0.arch.tar.gz
+036b9a7bc935c0ccc9b699dae1543cb5  crossfire-1.60.0.tar.gz