- fix build on sle11sp1

OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=2

0001-fix-build-error-with-capability.h.diff

@@ -0,0 +1,24 @@
+From 18b8b6d42c9e8ed2964a312a8134adb482585e03 Mon Sep 17 00:00:00 2001
+From: Ludwig Nussel <ludwig.nussel@suse.de>
+Date: Thu, 23 Dec 2010 14:03:56 +0100
+Subject: [PATCH] fix build error with capability.h
+
+---
+ src/murmur/murmur_pch.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/src/murmur/murmur_pch.h b/src/murmur/murmur_pch.h
+index daf7884..27c38a1 100644
+--- a/src/murmur/murmur_pch.h
++++ b/src/murmur/murmur_pch.h
+@@ -56,6 +56,7 @@ extern "C" {
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #ifdef Q_OS_LINUX
++#include <linux/types.h> // needed to work around evil magic stuff in capability.h
+ #include <sys/capability.h>
+ #include <sys/prctl.h>
+ #endif
+-- 
+1.7.1
+

mumble.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Dec 23 13:28:42 UTC 2010 - lnussel@suse.de
+
+- fix build on sle11sp1
+
 -------------------------------------------------------------------
 Wed Dec 15 15:16:45 UTC 2010 - lnussel@suse.de
 

mumble.spec

@@ -79,6 +79,7 @@ Source2:        mumble-server.init
 Patch0:         mumble-1.2.1-wizardpageorder.diff
 Patch1:         0003-fix-long-username-query.patch
 Patch2:         0004-fix-username-validation.patch
+Patch3:         0001-fix-build-error-with-capability.h.diff
 Patch50:        mumble-1.2.2-buildcompare.diff
 # hack, no clue about glx so no idea to fix this properly
 Patch99:        mumble-1.1.4-sle10glx.diff
@@ -116,6 +117,8 @@ Provides:       mumble = %version
 #
 %if !%{with system_celt}
 Source50: http://downloads.xiph.org/releases/celt/celt-0.7.0.tar.gz
+Source51: http://downloads.xiph.org/releases/celt/celt-0.9.0.tar.gz
+Source52: http://downloads.xiph.org/releases/celt/celt-0.10.0.tar.gz
 %endif
 %endif
 
@@ -146,6 +149,7 @@ won't be audible to other players.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 #
 %patch50 -p1
 %if 0%{?suse_version} && 0%{?suse_version} < 1020
@@ -159,8 +163,10 @@ won't be audible to other players.
 %if 0%{?snapshot:1}
 tar -xzf %SOURCE50
 sed -i -e 's/celt-0.6.1-build//;s/celt-0.6.2-build//' main.pro
-rmdir celt-0.7.0-src
-mv celt-0.7.0 celt-0.7.0-src
+for v in 0.7.0 0.9.0 0.10.0; do
+	rmdir celt-$v-src
+	mv celt-$v celt-$v-src
+done
 %endif
 %endif
 #