From 0d3bebea70353acb8ed45d6d4d748317e5d6fbca Mon Sep 17 00:00:00 2001
From: Michael Thomas <wart@fedoraproject.org>
Date: Jul 20 2007 02:12:43 +0000
Subject: Update to 1.10.0


---

diff --git a/.cvsignore b/.cvsignore
index d28130c..ce6b20c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-crossfire-client-1.9.1.tar.gz
+crossfire-client-1.10.0.tar.gz
diff --git a/crossfire-client.spec b/crossfire-client.spec
index b7b4396..33bb2b9 100644
--- a/crossfire-client.spec
+++ b/crossfire-client.spec
@@ -1,12 +1,11 @@
 Name: crossfire-client
-Version: 1.9.1
-Release: 3%{?dist}
+Version: 1.10.0
+Release: 1%{?dist}
 Summary: Client for connecting to crossfire servers
 Group: Amusements/Games
 License: GPL
 URL: http://crossfire.real-time.com
 Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.gz
-Patch0:  crossfire-1.9.1-menusegfault.patch
 BuildRequires: SDL-devel SDL_image-devel
 BuildRequires: gtk+-devel gtk2-devel libpng-devel
 BuildRequires: desktop-file-utils ImageMagick
@@ -27,7 +26,6 @@ package.
 
 %prep
 %setup -q
-%patch0 -p0
 
 for size in 48x48 32x32 16x16 ; do 
     convert -transparent white pixmaps/${size}.png temp.png
@@ -37,7 +35,7 @@ done
 %build
 chmod 755 configure
 # Disable sound for Fedora until it's working again.
-%configure --datadir=%{_datadir}/crossfire \
+%configure \
         --disable-sound \
         --disable-dmalloc
 
@@ -55,28 +53,25 @@ install -d $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/apps
 %makeinstall mandir=$RPM_BUILD_ROOT%{_mandir}
 
 install -m 644 pixmaps/16x16.png \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/crossfire-client.png
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/crossfire-client.png
 install -m 644 pixmaps/32x32.png \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/crossfire-client.png
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/crossfire-client.png
 install -m 644 pixmaps/48x48.png \
-	$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/crossfire-client.png
+        $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/crossfire-client.png
 install -m 644 pixmaps/16x16.png \
-	$RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/apps/crossfire-client.png
+        $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/apps/crossfire-client.png
 install -m 644 pixmaps/32x32.png \
-	$RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/apps/crossfire-client.png
+        $RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/apps/crossfire-client.png
 install -m 644 pixmaps/48x48.png \
-	$RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/apps/crossfire-client.png
+        $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/apps/crossfire-client.png
 
+sed -i -e 's/^Name=.*/Name=Crossfire/' gtk/crossfire-client.desktop
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category Game                                     \
         --add-category RolePlaying                              \
         gtk/crossfire-client.desktop
 
-# Create this directory that will be used by the client image and
-# sound packages.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/crossfire/%{name}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -100,7 +95,6 @@ fi
 # Sound support is too broken to use in Fedora right now.
 #%{_bindir}/cfsndserv
 #%{_bindir}/cfsndserv_alsa9
-%dir %{_datadir}/crossfire/%{name}
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
@@ -114,6 +108,10 @@ fi
 
 
 %changelog
+* Wed Jul 18 2007 Wart <wart@kobold.org> 1.10.0-1
+- Remove unused data directory
+- Update to 1.10.0
+
 * Sat Mar 3 2007 Wart <wart@kobold.org> 1.9.1-3
 - Use more precise desktop file categories
 - Use better sourceforge download url
diff --git a/sources b/sources
index 34d7d95..b3eabdc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7084c22c1f2074c95fe34331ac2ceae  crossfire-client-1.9.1.tar.gz
+883296ef199cbf47334d52d8b5d61886  crossfire-client-1.10.0.tar.gz