[crossfire] New upstream.

[Jon Ciesla]

commit 92f24f96740f28f86af52074d29fcede752072d6
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Mar 27 10:34:13 2012 -0500

    New upstream.

 .gitignore     |    2 ++
 crossfire.spec |   24 +++++++++++++++---------
 sources        |    4 ++--
 3 files changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 386da0a..926b7c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ 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
+/crossfire-1.70.0.tar.gz
+/crossfire-1.70.0.arch.tar.gz
diff --git a/crossfire.spec b/crossfire.spec
index e6585fa..b33099d 100644
--- a/crossfire.spec
+++ b/crossfire.spec
@@ -7,8 +7,8 @@
 %define logwatch_scripts %{logwatch_root}/scripts
 
 Name: crossfire
-Version: 1.60.0
-Release: 2%{?dist}
+Version: 1.70.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
@@ -26,7 +26,7 @@ Source8: logwatch.logconf.crossfire
 Source9: logwatch.script.crossfire
 Source10: logwatch.serviceconf.crossfire
 #Patch0:  crossfire-1.10.0-log-login.patch
-Patch1:  crossfire-1.11.0-curl.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
@@ -110,7 +110,7 @@ logwatch scripts for the Crossfire game server
 %setup -q
 %setup -q -a 1
 #%%patch0 -p0
-%patch1 -p0
+#%patch1 -p0
 mkdir SELinux
 cp  %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux
 
@@ -178,17 +178,17 @@ mv $RPM_BUILD_ROOT%{_bindir}/player_dl.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/too
 
 # Binary for running a crossfire metaserver.  Requires interaction with
 # a web server, so we disable this for now.
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/metaserver.pl
+#rm $RPM_BUILD_ROOT%{_libdir}/%{name}/metaserver.pl
 
 # I have no idea what this is for.
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/mktable.script $RPM_BUILD_ROOT%{_datadir}/%{name}/tools
+#mv $RPM_BUILD_ROOT%{_libdir}/%{name}/mktable.script $RPM_BUILD_ROOT%{_datadir}/%{name}/tools
 
 # This is not needed anymore based on comments at the top of
 # the file itself.
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/add_throw.perl
+#rm $RPM_BUILD_ROOT%{_libdir}/%{name}/add_throw.perl
 
 # /usr/bin is a better place for the standalone random map generator
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/random_map $RPM_BUILD_ROOT%{_bindir}/cross_random_map
+#mv $RPM_BUILD_ROOT/usr/libexec/crossfire/random_map $RPM_BUILD_ROOT%{_bindir}/cross_random_map
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins/*.la
 
@@ -314,10 +314,11 @@ rm -rf $RPM_BUILD_ROOT
 #%%{_bindir}/crossfire
 %{_bindir}/crossfire-server
 %{_bindir}/crossloop
-%{_bindir}/cross_random_map
 %{_datadir}/%{name}
 %dir %{_libdir}/%{name}
 %dir %{_sysconfdir}/%{name}
+%dir %{_libexecdir}/%{name}
+%{_libexecdir}/%{name}/*
 %config(noreplace) %{_sysconfdir}/%{name}/ban_file
 %config(noreplace) %{_sysconfdir}/%{name}/dm_file
 %config(noreplace) %{_sysconfdir}/%{name}/exp_table
@@ -327,6 +328,7 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/%{name}/rules
 %config(noreplace) %{_sysconfdir}/%{name}/settings
 %config(noreplace) %{_sysconfdir}/%{name}/metaserver2
+%config(noreplace) %{_sysconfdir}/%{name}/stat_bonus
 %attr(-,crossfire,root) %{_var}/games/%{name}
 %attr(-,crossfire,root) %{_var}/log/%{name}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
@@ -367,6 +369,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Mar 27 2012 Jon Ciesla <limburgher at gmail.com> - 1.70.0-1
+- New upstream.
+- Curl patch upstreamed.
+
 * Tue Jan 31 2012 Jon Ciesla <limburgher at gmail.com> - 1.60.0-2
 - Migrate to systemd, BZ 771752.
 
diff --git a/sources b/sources
index d6ceeb2..7d424b0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-36dbbb5ac9a4b82be2aff9ac803f73bd  crossfire-1.60.0.arch.tar.gz
-036b9a7bc935c0ccc9b699dae1543cb5  crossfire-1.60.0.tar.gz
+f35165d1a551dc278722fd7a85dbf0b0  crossfire-1.70.0.tar.gz
+65d9aed276bdabedacaf1142c7c17731  crossfire-1.70.0.arch.tar.gz