[cegui] Update to 0.8.4

[Martin Preisler]

commit d7a439462c6c2a4cb0c5cadea93ef98b7b457d69
Author: Martin Preisler <mpreisle at redhat.com>
Date:   Mon Jul 7 14:42:11 2014 +0200

    Update to 0.8.4

 .gitignore |    1 +
 cegui.spec |   35 ++++++++++-------------------------
 sources    |    2 +-
 3 files changed, 12 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c7e2a0..51e71af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ CEGUI-0.6.2-DOCS.tar.gz
 /CEGUI-0.7.7.tar.gz
 /CEGUI-0.7.9.tar.gz
 /cegui-0.8.3.tar.gz
+/cegui-0.8.4.tar.bz2
diff --git a/cegui.spec b/cegui.spec
index 0c8de14..75b30fc 100644
--- a/cegui.spec
+++ b/cegui.spec
@@ -2,21 +2,14 @@
 %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 
 Name:           cegui
-Version:        0.8.3
-Release:        4%{?dist}
+Version:        0.8.4
+Release:        1%{?dist}
 Summary:        Free library providing windowing and widgets for graphics APIs / engines
 Group:          System Environment/Libraries
 License:        MIT
 URL:            http://www.cegui.org.uk
-Source0:        http://downloads.sourceforge.net/crayzedsgui/cegui-%{version}.tar.gz
-# All 5 these patches are already upstream for 0.8.4, drop when we rebase
-Patch0:         cegui-0.8.3-cmake-cmp0045.patch
-Patch1:         cegui-0.8.3-python-sitearch.patch
-Patch2:         cegui-0.8.3-freetype.patch
-Patch3:         cegui-0.8.3-lua5.1.patch
-Patch4:         cegui-0.8.3-ogre-1.9.patch
-# http://cegui.org.uk/mantis/view.php?id=1027
-Patch5:         cegui-0.8.3-pc-include-fix.patch
+Source0:        http://downloads.sourceforge.net/crayzedsgui/cegui-%{version}.tar.bz2
+
 BuildRequires:  DevIL-devel
 BuildRequires:  freeimage-devel
 BuildRequires:  expat-devel
@@ -163,17 +156,6 @@ OpenGLRenderer (module PyCEGUIOpenGLRenderer).
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-# Encoding fixes (fixed upstream, should be removed with 0.8.4 release)
-iconv -f iso8859-1 doc/README -t utf8 > doc/README.conv
-touch -r doc/README doc/README.conv 
-mv -f doc/README.conv doc/README
 
 %build
 %cmake \
@@ -191,8 +173,8 @@ make html %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} 
-mkdir -p %{buildroot}/%{_docdir}/cegui-0.8.3/
-cp -r doc/doxygen/html %{buildroot}/%{_docdir}/cegui-0.8.3/
+mkdir -p %{buildroot}/%{_docdir}/cegui-0.8.4/
+cp -r doc/doxygen/html %{buildroot}/%{_docdir}/cegui-0.8.4/
 
 # Fedora sadly doesn't ship python-ogre so this module would be useless
 find $RPM_BUILD_ROOT -name "PyCEGUIOgreRenderer.so" -exec rm -f {} ';'
@@ -230,7 +212,7 @@ find $RPM_BUILD_ROOT -name "PyCEGUIOgreRenderer.so" -exec rm -f {} ';'
 %{_datadir}/cegui-0
 
 %files devel-doc
-%doc %{_docdir}/cegui-0.8.3/html
+%doc %{_docdir}/cegui-0.8.4/html
 
 %files samples
 %{_bindir}/CEGUISampleFramework-0.8
@@ -265,6 +247,9 @@ find $RPM_BUILD_ROOT -name "PyCEGUIOgreRenderer.so" -exec rm -f {} ';'
 
 
 %changelog
+* Mon Jul 07 2014 Martin Preisler <mpreisle at redhat.com> - 0.8.4-1
+- Updated to new upstream release
+
 * Tue Jun 10 2014 Hans de Goede <hdegoede at redhat.com> - 0.8.3-4
 - Fix wrong include path in CEGUI-0.pc
 
diff --git a/sources b/sources
index 195e0b2..722e536 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-142cca3648cee034e04d0f61bd9863ce  cegui-0.8.3.tar.gz
+344917301b5ed867a07575ee6a828667  cegui-0.8.4.tar.bz2