[cegui] Update to 0.8.3
Martin Preisler
mpreisle at fedoraproject.org
Thu Jun 5 12:41:37 UTC 2014
commit 24466bfc2819e8f220d6ecd72533a4743ae3c12d
Author: Martin Preisler <mpreisle at redhat.com>
Date: Thu Jun 5 14:40:51 2014 +0200
Update to 0.8.3
.gitignore | 1 +
cegui.spec | 136 +++++++++++++++++++++++++++++++++++-------------------------
sources | 2 +-
3 files changed, 81 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7d81f7..4c7e2a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ CEGUI-0.6.2-DOCS.tar.gz
/CEGUI-0.7.6.tar.gz
/CEGUI-0.7.7.tar.gz
/CEGUI-0.7.9.tar.gz
+/cegui-0.8.3.tar.gz
diff --git a/cegui.spec b/cegui.spec
index b7689ca..fad6383 100644
--- a/cegui.spec
+++ b/cegui.spec
@@ -1,14 +1,15 @@
# for PyCEGUI
+%{!?python_sitenoarch: %global python_sitenoarch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(0))")}
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
Name: cegui
-Version: 0.7.9
-Release: 8%{?dist}
+Version: 0.8.3
+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
+Source0: http://downloads.sourceforge.net/crayzedsgui/cegui-%{version}.tar.gz
BuildRequires: DevIL-devel
BuildRequires: freeimage-devel
BuildRequires: expat-devel
@@ -36,7 +37,7 @@ BuildRequires: python-devel
BuildRequires: boost-devel
# filter PyCEGUI modules from Provides
%{?filter_setup:
-%filter_provides_in %{python_sitearch}/.*\.so$
+%filter_provides_in %{python_sitearch}/.*\.so$
%filter_setup
}
@@ -73,6 +74,13 @@ Requires: cegui-devel = %{version}-%{release}
%description devel-doc
API and Falagard skinning documentation for cegui
+%package samples
+Summary: Executable samples provided with the library
+Requires: cegui = %{version}-%{release}
+Requires: cegui-*-renderer
+
+%description samples
+Several interactive sample programs demonstrating functionality of the CEGUI library.
%package DevIL-imagecodec
Summary: Alternative imagecodec library for CEGUI using DevIL
@@ -100,7 +108,6 @@ Requires: cegui = %{version}-%{release}
%description irrlicht-renderer
Irrlicht renderer for CEGUI.
-
%package ogre-renderer
Summary: OGRE renderer for CEGUI
Group: System Environment/Libraries
@@ -148,41 +155,40 @@ from python. Contains bindings for the CEGUI library itself and its
OpenGLRenderer (module PyCEGUIOpenGLRenderer).
%prep
-%setup -q -n CEGUI-%{version}
+%setup -q
-# Permission fixes for debuginfo RPM
-chmod -x cegui/include/falagard/*.h
-
-# Encoding fixes
+# 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
-# We patched acinclude.m4 so we need to bootstrap
-# ./bootstrap
-%configure --disable-static --disable-corona --disable-samples \
- --disable-directfb-renderer \
- --enable-toluacegui \
- --with-default-xml-parser=ExpatParser \
- --with-default-image-codec=SILLYImageCodec \
- --with-pic
-# Don't use rpath!
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-make %{?_smp_mflags} 'Ogre_LIBS = -L%{_libdir} -lOgreMain -lpthread'
-pushd doc/doxygen
-doxygen doxyfile
-popd
-
+%cmake \
+-D CMAKE_INSTALL_DOCDIR=%{_pkgdocdir} \
+-D CEGUI_BUILD_RENDERER_DIRECTFB=false \
+-D CEGUI_BUILD_RENDERER_NULL=false \
+-D CEGUI_BUILD_IMAGECODEC_STB=false \
+-D CEGUI_BUILD_IMAGECODEC_TGA=false \
+-D CEGUI_OPTION_DEFAULT_XMLPARSER=ExpatParser \
+-D CEGUI_OPTION_DEFAULT_IMAGECODEC=SILLYImageCodec \
+.
+
+make %{?_smp_mflags}
+make html %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot}
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+mkdir -p %{buildroot}/%{_docdir}/cegui-0.8.3/
+cp -r doc/doxygen/html %{buildroot}/%{_docdir}/cegui-0.8.3/
+
# Fedora sadly doesn't ship python-ogre so this module would be useless
find $RPM_BUILD_ROOT -name "PyCEGUIOgreRenderer.so" -exec rm -f {} ';'
+# We need to move PyCEGUI shared objects into the platform specific Python site-packages
+# This has been fixed upstream, we should be able to remove this with 0.8.4 release.
+mkdir -p %{buildroot}/%{python_sitearch}/cegui-0.8
+mv %{buildroot}/%{python_sitenoarch}/cegui-0.8/PyCEGUI*.so %{buildroot}/%{python_sitearch}/cegui-0.8
+rmdir %{buildroot}/%{python_sitenoarch}/cegui-0.8
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
@@ -190,55 +196,71 @@ find $RPM_BUILD_ROOT -name "PyCEGUIOgreRenderer.so" -exec rm -f {} ';'
%files
%doc doc/COPYING doc/README
-%{_libdir}/libCEGUI*-%{version}.so
-%exclude %{_libdir}/libCEGUIDevILImageCodec-%{version}.so
-%exclude %{_libdir}/libCEGUIFreeImageImageCodec-%{version}.so
-%exclude %{_libdir}/libCEGUIIrrlichtRenderer-%{version}.so
-%exclude %{_libdir}/libCEGUIOgreRenderer-%{version}.so
-%exclude %{_libdir}/libCEGUILibxmlParser-%{version}.so
-%exclude %{_libdir}/libCEGUITinyXMLParser-%{version}.so
-%exclude %{_libdir}/libCEGUIXercesParser-%{version}.so
+%{_libdir}/libCEGUIBase-0.so.*
+%{_libdir}/libCEGUICommonDialogs-0.so.*
+%{_libdir}/libCEGUILuaScriptModule-0.so.*
+%{_libdir}/libCEGUIOpenGLRenderer-0.so.*
+%{_libdir}/cegui-0.8/libCEGUICoreWindowRendererSet.so
+# this is the default parser, that's why it's not split off into a subpackage
+%{_libdir}/cegui-0.8/libCEGUIExpatParser.so
+# same with silly image codec
+%{_libdir}/cegui-0.8/libCEGUISILLYImageCodec.so
%files devel
-%{_bindir}/tolua++cegui
-%{_libdir}/*.so
-%exclude %{_libdir}/libCEGUI*-%{version}.so
-%{_libdir}/pkgconfig/CEGUI-OPENGL.pc
-%{_libdir}/pkgconfig/CEGUI-OGRE.pc
-%{_libdir}/pkgconfig/CEGUI.pc
-%{_includedir}/CEGUI
-%{_datadir}/CEGUI
+%{_libdir}/libCEGUI*-0.so
-%files devel-doc
-%doc doc/doxygen/html
+%{_bindir}/toluappcegui-0.8
-%files DevIL-imagecodec
-%{_libdir}/libCEGUIDevILImageCodec-%{version}.so
+%{_libdir}/pkgconfig/CEGUI-0.pc
+%{_libdir}/pkgconfig/CEGUI-0-OPENGL.pc
+%{_libdir}/pkgconfig/CEGUI-0-OPENGL3.pc
+%{_libdir}/pkgconfig/CEGUI-0-OGRE.pc
+%{_libdir}/pkgconfig/CEGUI-0-LUA.pc
+%{_libdir}/pkgconfig/CEGUI-0-IRRLICHT.pc
-%files freeimage-imagecodec
-%{_libdir}/libCEGUIFreeImageImageCodec-%{version}.so
+%{_includedir}/cegui-0
+
+%{_datadir}/cegui-0
+
+%files devel-doc
+%doc %{_docdir}/cegui-0.8.3/html
+
+%files samples
+%{_bindir}/CEGUISampleFramework-0.8
+%{_libdir}/cegui-0.8/libCEGUI*Demo.so
+%{_libdir}/cegui-0.8/libCEGUIDemo6.so
+%{_libdir}/cegui-0.8/libCEGUIMinesweeper.so
%files irrlicht-renderer
-%{_libdir}/libCEGUIIrrlichtRenderer-%{version}.so
+%{_libdir}/libCEGUIIrrlichtRenderer-0.so.*
%files ogre-renderer
-%{_libdir}/libCEGUIOgreRenderer-%{version}.so
+%{_libdir}/libCEGUIOgreRenderer-0.so.*
+
+%files DevIL-imagecodec
+%{_libdir}/cegui-0.8/libCEGUIDevILImageCodec.so
+
+%files freeimage-imagecodec
+%{_libdir}/cegui-0.8/libCEGUIFreeImageImageCodec.so
%files libxml-xmlparser
-%{_libdir}/libCEGUILibxmlParser-%{version}.so
+%{_libdir}/cegui-0.8/libCEGUILibXMLParser.so
%files tinyxml-xmlparser
-%{_libdir}/libCEGUITinyXMLParser-%{version}.so
+%{_libdir}/cegui-0.8/libCEGUITinyXMLParser.so
%files xerces-xmlparser
-%{_libdir}/libCEGUIXercesParser-%{version}.so
+%{_libdir}/cegui-0.8/libCEGUIXercesParser.so
%files python
-%{python_sitearch}/PyCEGUI.so
-%{python_sitearch}/PyCEGUIOpenGLRenderer.so
+%{python_sitearch}/cegui-0.8/PyCEGUI.so
+%{python_sitearch}/cegui-0.8/PyCEGUIOpenGLRenderer.so
%changelog
+* Tue Jun 03 2014 Martin Preisler <mpreisle at redhat.com> - 0.8.3-1
+- Updated to new upstream release
+
* Fri May 23 2014 Petr Machata <pmachata at redhat.com> - 0.7.9-8
- Rebuild for boost 1.55.0
diff --git a/sources b/sources
index e240918..195e0b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a8b682daf82e383edc169c2e6eb2b321 CEGUI-0.7.9.tar.gz
+142cca3648cee034e04d0f61bd9863ce cegui-0.8.3.tar.gz
More information about the scm-commits
mailing list