[mumble/f16] - Updated Ice version in patch0 - Added new patch to build against celt071 includes thanks to Floren

[Andreas Osowski]

commit e27b28303feab41e891871b91cf1616c53bd5d91
Author: Andreas Osowski <andreas.chr.osowski at gmail.com>
Date:   Thu Nov 10 01:02:53 2011 +0100

    - Updated Ice version in patch0
    - Added new patch to build against celt071 includes thanks to Florent Le Coz

 mumble-1.2.3-celt_include_dir.patch |   11 +++++++++++
 mumble-1.2.3-slice2cpp.patch        |    2 +-
 mumble.spec                         |   11 ++++++++---
 3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/mumble-1.2.3-celt_include_dir.patch b/mumble-1.2.3-celt_include_dir.patch
new file mode 100644
index 0000000..9523e6a
--- /dev/null
+++ b/mumble-1.2.3-celt_include_dir.patch
@@ -0,0 +1,11 @@
+--- mumble-1.2.3.orig/src/mumble/mumble.pro	2011-02-19 22:35:17.000000000 +0100
++++ mumble-1.2.3/src/mumble/mumble.pro	2011-02-19 22:35:17.000000000 +0100
+@@ -46,7 +46,7 @@
+ }
+ 
+ CONFIG(no-bundled-celt) {
+-  INCLUDEPATH	*= /usr/include/celt
++  INCLUDEPATH	*= /usr/include/celt071
+ }
+ 
+ !CONFIG(no-bundled-celt) {
diff --git a/mumble-1.2.3-slice2cpp.patch b/mumble-1.2.3-slice2cpp.patch
index 1979b7d..79cc1d0 100644
--- a/mumble-1.2.3-slice2cpp.patch
+++ b/mumble-1.2.3-slice2cpp.patch
@@ -6,7 +6,7 @@ diff -aur mumble-1.2.3.orig/src/murmur/murmur.pro mumble-1.2.3/src/murmur/murmur
  		slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" Murmur.ice
  	} else {
 -		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ Murmur.ice
-+		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.0/slice/ Murmur.ice
++		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ Murmur.ice
  	}
  
  	slice.depends = Murmur.ice
diff --git a/mumble.spec b/mumble.spec
index 5865584..d101784 100644
--- a/mumble.spec
+++ b/mumble.spec
@@ -1,6 +1,6 @@
 Name:		mumble
 Version:	1.2.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Voice chat suite aimed at gamers
 
 Group:		Applications/Internet
@@ -13,7 +13,7 @@ Source3:	%{name}11x.desktop
 Source4:	%{name}-overlay.desktop
 Source5:	murmur-tmpfiles.conf
 Patch0:		%{name}-%{version}-slice2cpp.patch
-#fixes compile error on f10 and above
+Patch1:         %{name}-%{version}-celt_include_dir.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	qt-devel, boost-devel, ice-devel
@@ -22,7 +22,7 @@ BuildRequires:	pulseaudio-libs-devel, speex-devel
 BuildRequires:	speech-dispatcher-devel, libogg-devel
 BuildRequires:	libcap-devel
 BuildRequires:	desktop-file-utils, openssl-devel
-BuildRequires:	libXevie-devel, celt-devel
+BuildRequires:	libXevie-devel, celt071-devel
 BuildRequires:	protobuf-compiler, avahi-compat-libdns_sd-devel
 BuildRequires:	libsndfile-devel, protobuf-devel
 Requires:	celt071
@@ -92,6 +92,7 @@ exit 0
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{_qt4_qmake} "CONFIG+=no-bundled-speex no-g15 \
@@ -286,6 +287,10 @@ fi
 %{_datadir}/kde4/services/mumble.protocol
 
 %changelog
+* Thu Nov 10 2011 Andreas Osowski <th0br0 at mkdir.name> - 1.2.3-5
+- Updated Ice version in patch0
+- Added new patch to build against celt071 includes thanks to Florent Le Coz
+
 * Thu Nov 10 2011 Andreas Osowski <th0br0 at mkdir.name> - 1.2.3-4
 - rebuilt for protobuf update