[crossfire-client] 1.60.0.

[Jon Ciesla]

commit 8a82ab2bdc1e663e2f00ca77420b869a0647b24a
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jan 12 08:14:35 2012 -0600

    1.60.0.

 .gitignore                         |    1 +
 crossfire-client-1.11.0-curl.patch |   11 +++++++++++
 crossfire-client.spec              |   34 ++++++++++++++++++++++------------
 sources                            |    2 +-
 4 files changed, 35 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 70e84c1..f745baf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 crossfire-client-1.11.0.tar.gz
+/crossfire-client-1.60.0.tar.gz
diff --git a/crossfire-client-1.11.0-curl.patch b/crossfire-client-1.11.0-curl.patch
new file mode 100644
index 0000000..48d1fcf
--- /dev/null
+++ b/crossfire-client-1.11.0-curl.patch
@@ -0,0 +1,11 @@
+--- common/metaserver.c~	2008-01-29 01:29:05.000000000 -0600
++++ common/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-client.spec b/crossfire-client.spec
index c5ad635..6f36d97 100644
--- a/crossfire-client.spec
+++ b/crossfire-client.spec
@@ -1,11 +1,12 @@
 Name: crossfire-client
-Version: 1.11.0
-Release: 5%{?dist}
+Version: 1.60.0
+Release: 1%{?dist}
 Summary: Client for connecting to crossfire servers
 Group: Amusements/Games
 License: GPLv2+
 URL: http://crossfire.real-time.com
 Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.gz
+Patch0: crossfire-client-1.11.0-curl.patch
 BuildRequires: SDL-devel SDL_image-devel
 BuildRequires: gtk+-devel gtk2-devel libpng-devel curl-devel
 BuildRequires: desktop-file-utils ImageMagick
@@ -27,6 +28,8 @@ package.
 %prep
 %setup -q
 
+%patch0 -p0
+
 for size in 48x48 32x32 16x16 ; do 
     convert -transparent white pixmaps/${size}.png temp.png
     mv temp.png pixmaps/${size}.png
@@ -39,7 +42,7 @@ chmod 755 configure
         --disable-sound \
         --disable-dmalloc
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} LDFLAGS="-lX11"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -65,12 +68,12 @@ install -m 644 pixmaps/32x32.png \
 install -m 644 pixmaps/48x48.png \
         $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/apps/crossfire-client.png
 
-sed -i -e 's/^Name=.*/Name=Crossfire/' gtk/crossfire-client.desktop
+sed -i -e 's/^Name=.*/Name=Crossfire/' gtk-v2/crossfire-client.desktop
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category Game                                     \
         --add-category RolePlaying                              \
-        gtk/crossfire-client.desktop
+        gtk-v2/crossfire-client.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,12 +92,13 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/cfclient
-%{_bindir}/gcfclient
-%{_bindir}/gcfclient2
+%{_bindir}/*
+#%%{_bindir}/cfclient
+#%%{_bindir}/gcfclient
+#%%{_bindir}/gcfclient2
 # Sound support is too broken to use in Fedora right now.
-#%{_bindir}/cfsndserv
-#%{_bindir}/cfsndserv_alsa9
+#%%{_bindir}/cfsndserv
+#%%{_bindir}/cfsndserv_alsa9
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
@@ -102,12 +106,18 @@ fi
 %{_datadir}/icons/locolor/16x16/apps/%{name}.png
 %{_datadir}/icons/locolor/32x32/apps/%{name}.png
 %{_datadir}/icons/locolor/48x48/apps/%{name}.png
-%{_mandir}/man6/gcfclient.6*
-%{_mandir}/man6/cfclient.6*
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/*
+#%%{_mandir}/man6/gcfclient.6*
+#%%{_mandir}/man6/cfclient.6*
+%{_mandir}/man6/*
 %doc ChangeLog COPYING License NOTES README TODO
 
 
 %changelog
+* Wed Jan 11 2012 Jon Ciesla <limburgher at gmail.com> - 1.60.0-1
+- New upstream.
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1.11.0-5
 - Rebuild for new libpng
 
diff --git a/sources b/sources
index fa3eb01..5e66c27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7c47046067bb0bada9951e61d0d2980b  crossfire-client-1.11.0.tar.gz
+7b22bf93ebb581a5bfd5682df107af76  crossfire-client-1.60.0.tar.gz