- up to 0.8.7

- removed obsolete patches

diff --git a/CEGUI-python.patch b/CEGUI-python.patch
deleted file mode 100644 (file)
index d15a8a5..0000000
--- a/CEGUI-python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cegui-0.8.4/CMakeLists.txt.orig    2014-07-07 10:46:25.000000000 +0200
-+++ cegui-0.8.4/CMakeLists.txt 2014-10-26 07:04:55.574145118 +0100
-@@ -106,7 +106,7 @@
- find_package(Lua51)
- find_package(TOLUAPP)
- find_package(PythonInterp)
--find_package(PythonLibs)
-+find_package(PythonLibs ${PYTHON_VERSION_STRING})
- find_package(Boost 1.36.0 COMPONENTS python unit_test_framework system)
- 
- find_package(Doxygen)

diff --git a/CEGUI.spec b/CEGUI.spec
index 525dd215a0d88728c70aad442b5ca06d1d4d3c91..c9513772625bbeeba816aa8e744d23d3ec8501d9 100644 (file)
--- a/CEGUI.spec
+++ b/CEGUI.spec
@@ -9,25 +9,24 @@
 Summary:       CEGUI - a free library providing windowing and widgets
 Summary(pl.UTF-8):     CEGUI - wolnodostępna biblioteka zapewniającą okienka i widgety
 Name:          CEGUI
-Version:       0.8.4
-Release:       9
+Version:       0.8.7
+Release:       1
 License:       LGPL v2.1+ (with MIT parts)
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/crayzedsgui/cegui-%{version}.tar.bz2
-# Source0-md5: 344917301b5ed867a07575ee6a828667
-Source1:       http://downloads.sourceforge.net/crayzedsgui/cegui-docs-%{version}.tar.bz2
-# Source1-md5: 1096bf8c84bf6a22e8892ab9258c22f6
+# Source0-md5: cebcc95e205b9ad353db0d65b9b2d505
+Source1:       http://downloads.sourceforge.net/crayzedsgui/cegui-docs.%{version}.zip
+# Source1-md5: 5f3b19f82cf1e11b4406560b8e809f20
 Patch0:                pthread.patch
 Patch1:                %{name}-glfw3.patch
-Patch2:                %{name}-python.patch
 Patch3:                x32.patch
-Patch4:                boost-1.59.patch
 URL:           http://www.cegui.org.uk/
 BuildRequires: DevIL-devel
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 1.2.0}
 BuildRequires: FreeImage-devel
 BuildRequires: GLM
 BuildRequires: OpenGL-devel
+BuildRequires: SDL2-devel
 BuildRequires: SILLY-devel >= 0.1.0
 BuildRequires: boost-devel >= 1.36.0
 BuildRequires: boost-python-devel >= 1.36.0
@@ -190,6 +189,33 @@ Header files for CEGUI FreeImageImageCodec library.
 %description ImageCodec-FreeImage-devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki CEGUI FreeImageImageCodec.
 
+%package ImageCodec-SDL2
+Summary:       SDL2ImageCodec library for CEGUI
+Summary(pl.UTF-8):     Biblioteka SDL2ImageCodec dla CEGUI
+Group:         Libraries
+Requires:      %{name} = %{version}-%{release}
+Requires:      SDL2
+
+%description ImageCodec-SDL2
+SDL2ImageCodec library for CEGUI.
+
+%description ImageCodec-SDL2 -l pl.UTF-8
+Biblioteka SDL2ImageCodec dla CEGUI
+
+%package ImageCodec-SDL2-devel
+Summary:       Header files for CEGUI SDL2ImageCodec library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki CEGUI SDL2ImageCodec
+Group:         Development/Libraries
+Requires:      %{name}-ImageCodec-SDL2 = %{version}-%{release}
+Requires:      %{name}-devel = %{version}-%{release}
+Requires:      SDL2-devel >= 0.1.0
+
+%description ImageCodec-SDL2-devel
+Header files for CEGUI SDL2ImageCodec library.
+
+%description ImageCodec-SDL2-devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki CEGUI SDL2ImageCodec.
+
 %package ImageCodec-SILLY
 Summary:       SILLYImageCodec library for CEGUI
 Summary(pl.UTF-8):     Biblioteka SILLYImageCodec dla CEGUI
@@ -432,9 +458,7 @@ Wiązania Pythona do biblioteki CEGUI OpenGLRenderer.
 %setup -q -a 1 -n cegui-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 install -d build
@@ -476,7 +500,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/README.orig
+%doc README.md
 %attr(755,root,root) %{_libdir}/libCEGUIBase-0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libCEGUIBase-0.so.2
 %attr(755,root,root) %{_libdir}/libCEGUICommonDialogs-0.so.*.*.*
@@ -535,6 +559,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_includedir}/cegui-0/%{name}/ImageCodecModules/FreeImage
 
+%files ImageCodec-SDL2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUISDL2ImageCodec.so
+
+%files ImageCodec-SDL2-devel
+%defattr(644,root,root,755)
+%{_includedir}/cegui-0/%{name}/ImageCodecModules/SDL2
+
 %files ImageCodec-SILLY
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/cegui-0.8/libCEGUISILLYImageCodec.so

diff --git a/boost-1.59.patch b/boost-1.59.patch
deleted file mode 100644 (file)
index 2d8e716..0000000
--- a/boost-1.59.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- cegui-0.8.4/cegui/src/ScriptModules/Python/bindings/output/CEGUI/ResourceEventArgs.pypp.cpp.orig   2013-05-26 17:58:46.000000000 +0200
-+++ cegui-0.8.4/cegui/src/ScriptModules/Python/bindings/output/CEGUI/ResourceEventArgs.pypp.cpp        2015-11-21 16:33:29.302275302 +0100
-@@ -4,6 +4,14 @@
- #include "generators/include/python_CEGUI.h"
- #include "ResourceEventArgs.pypp.hpp"
- 
-+namespace boost { namespace python {
-+template <class D>
-+inline object make_setter(D const& x)
-+{
-+    return detail::make_setter(x, default_call_policies(), is_member_pointer<D>(), 0);
-+}
-+}}
-+
- namespace bp = boost::python;
- 
- void register_ResourceEventArgs_class(){
---- cegui-0.8.4/cegui/src/ScriptModules/Python/bindings/output/CEGUI/Scheme.pypp.cpp.orig      2013-05-26 17:58:46.000000000 +0200
-+++ cegui-0.8.4/cegui/src/ScriptModules/Python/bindings/output/CEGUI/Scheme.pypp.cpp   2015-11-21 16:26:43.769253262 +0100
-@@ -4,6 +4,14 @@
- #include "generators/include/python_CEGUI.h"
- #include "Scheme.pypp.hpp"
- 
-+namespace boost { namespace python {
-+template <class D>
-+inline object make_setter(D const& x)
-+{
-+    return detail::make_setter(x, default_call_policies(), is_member_pointer<D>(), 0);
-+}
-+}}
-+
- namespace bp = boost::python;
- 
- void register_Scheme_class(){
---- cegui-0.8.4/cegui/src/ScriptModules/Python/bindings/output/CEGUI/StdPairCEGUIStringString.pypp.cpp.orig    2013-05-26 17:58:46.000000000 +0200
-+++ cegui-0.8.4/cegui/src/ScriptModules/Python/bindings/output/CEGUI/StdPairCEGUIStringString.pypp.cpp 2015-11-21 16:24:44.334020922 +0100
-@@ -4,6 +4,14 @@
- #include "generators/include/python_CEGUI.h"
- #include "StdPairCEGUIStringString.pypp.hpp"
- 
-+namespace boost { namespace python {
-+template <class D>
-+inline object make_setter(D const& x)
-+{
-+    return detail::make_setter(x, default_call_policies(), is_member_pointer<D>(), 0);
-+}
-+}}
-+
- namespace bp = boost::python;
- 
- void register_StdPairCEGUIStringString_class(){
---- cegui-0.8.4/cegui/src/ScriptModules/Python/bindings/output/CEGUI/WindowFactoryManager.pypp.cpp.orig        2013-05-26 17:58:46.000000000 +0200
-+++ cegui-0.8.4/cegui/src/ScriptModules/Python/bindings/output/CEGUI/WindowFactoryManager.pypp.cpp     2015-11-21 16:35:45.367135886 +0100
-@@ -4,6 +4,14 @@
- #include "generators/include/python_CEGUI.h"
- #include "WindowFactoryManager.pypp.hpp"
- 
-+namespace boost { namespace python {
-+template <class D>
-+inline object make_setter(D const& x)
-+{
-+    return detail::make_setter(x, default_call_policies(), is_member_pointer<D>(), 0);
-+}
-+}}
-+
- namespace bp = boost::python;
- 
- void register_WindowFactoryManager_class(){