[cegui] - New upstream release 0.7.4
Hans de Goede
jwrdegoede at fedoraproject.org
Sat Nov 6 06:23:57 UTC 2010
commit eac78387cf1fdfeb81a4094a81e70ecaa31c8f62
Author: Hans de Goede <hdegoede at redhat.com>
Date: Sat Nov 6 07:22:51 2010 +0100
- New upstream release 0.7.4
.gitignore | 1 +
cegui-0.6.0-release-as-so-ver.patch | 316 -----------------------------------
cegui-0.6.0-userverso.patch | 21 ---
cegui-0.6.2-new-DevIL.patch | 21 ---
cegui-0.6.2-new-tinyxml.patch | 4 +-
cegui.spec | 65 +++-----
sources | 3 +-
7 files changed, 28 insertions(+), 403 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f26d318..4d00522 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
CEGUI-0.6.2.tar.gz
CEGUI-0.6.2-DOCS.tar.gz
+/CEGUI-0.7.4.tar.gz
diff --git a/cegui-0.6.2-new-tinyxml.patch b/cegui-0.6.2-new-tinyxml.patch
index 8671d42..7efc7b7 100644
--- a/cegui-0.6.2-new-tinyxml.patch
+++ b/cegui-0.6.2-new-tinyxml.patch
@@ -1,6 +1,6 @@
diff -up CEGUI-0.6.2/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp~ CEGUI-0.6.2/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp
---- CEGUI-0.6.2/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp~ 2008-11-27 14:39:04.000000000 +0100
-+++ CEGUI-0.6.2/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp 2010-06-21 17:02:21.068231195 +0200
+--- CEGUI-0.6.2/cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp~ 2008-11-27 14:39:04.000000000 +0100
++++ CEGUI-0.6.2/cegui/src/XMLParserModules/TinyXMLParser/CEGUITinyXMLParser.cpp 2010-06-21 17:02:21.068231195 +0200
@@ -131,10 +131,10 @@ namespace CEGUI
{
switch(childNode->Type())
diff --git a/cegui.spec b/cegui.spec
index 2b78abb..b06c584 100644
--- a/cegui.spec
+++ b/cegui.spec
@@ -1,22 +1,12 @@
Name: cegui
-Version: 0.6.2
-Release: 6%{?dist}
+Version: 0.7.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
-# This is
-# http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}.tar.gz
-# with the bundled GLEW: RendererModules/OpenGLGUIRenderer/GLEW
-# removed as its an older GLEW version which contains
-# parts under then non Free SGI OpenGL and GLX licenses
-Source0: CEGUI-%{version}.tar.gz
-Source1: http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}-DOCS.tar.gz
-# Both submitted upstream: http://www.cegui.org.uk/mantis/view.php?id=197
-Patch1: cegui-0.6.0-release-as-so-ver.patch
-Patch2: cegui-0.6.0-userverso.patch
+Source0: http://downloads.sourceforge.net/crayzedsgui/CEGUI-%{version}.tar.gz
# TODO: submit upstream
-Patch3: cegui-0.6.2-new-DevIL.patch
Patch4: cegui-0.6.2-new-tinyxml.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: DevIL-devel
@@ -35,6 +25,7 @@ BuildRequires: xerces-c-devel
BuildRequires: tolua++-devel
BuildRequires: tinyxml-devel
BuildRequires: glew-devel
+BuildRequires: doxygen
%description
Crazy Eddie's GUI System is a free library providing windowing and widgets for
@@ -64,44 +55,32 @@ API and Falagard skinning documentation for cegui
%prep
-%setup -qb1 -qn CEGUI-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%setup -q -n CEGUI-%{version}
%patch4 -p1
# Permission fixes for debuginfo RPM
-chmod -x include/falagard/*.h
-
-# Delete zero length file
-rm -f documentation/api_reference/keepme
+chmod -x cegui/include/falagard/*.h
# Encoding fixes
-iconv -f iso8859-1 AUTHORS -t utf8 > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
-iconv -f iso8859-1 TODO -t utf8 > TODO.conv && mv -f TODO.conv TODO
-iconv -f iso8859-1 README -t utf8 > README.conv && mv -f README.conv README
-
-# Make makefile happy even though we've removed the (unused) included copy of
-# GLEW due to license reasons
-mkdir -p RendererModules/OpenGLGUIRenderer/GLEW/GL
-touch RendererModules/OpenGLGUIRenderer/GLEW/GL/glew.h
-touch RendererModules/OpenGLGUIRenderer/GLEW/GL/glxew.h
-touch RendererModules/OpenGLGUIRenderer/GLEW/GL/wglew.h
-touch RendererModules/OpenGLGUIRenderer/GLEW/GLEW-LICENSE
+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
-%configure --disable-static --disable-corona --enable-devil \
- --enable-lua-module --disable-irrlicht-renderer --disable-samples \
- --disable-directfb-renderer \
- --with-default-xml-parser=ExpatParser --enable-silly \
- --with-default-image-codec=SILLYImageCodec --with-pic
-# We do not want to get linked against a system copy of ourselves!
-sed -i 's|-L%{_libdir}||g' RendererModules/OpenGLGUIRenderer/Makefile
+%configure --disable-static --disable-corona --disable-samples \
+ --disable-irrlicht-renderer --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}
+pushd doc/doxygen
+doxygen doxyfile
+popd
%install
@@ -120,12 +99,13 @@ rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc doc/COPYING doc/README
%{_libdir}/libCEGUI*-%{version}.so
%files devel
%defattr(-,root,root,-)
+%{_bindir}/tolua++cegui
%{_libdir}/*.so
%exclude %{_libdir}/libCEGUI*-%{version}.so
%{_libdir}/pkgconfig/CEGUI-OPENGL.pc
@@ -136,10 +116,13 @@ rm -rf %{buildroot}
%files devel-doc
%defattr(-,root,root,-)
-%doc documentation/FalagardSkinning.pdf documentation/api_reference
+%doc doc/doxygen/html
%changelog
+* Fri Nov 5 2010 Hans de Goede <hdegoede at redhat.com> 0.7.4-1
+- New upstream release 0.7.4
+
* Mon Jun 21 2010 Hans de Goede <hdegoede at redhat.com> 0.6.2-6
- Fix building with latest tinyxml (#599850)
diff --git a/sources b/sources
index 9b9d790..e01c7b3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-0e90f35f5f37e5349ba538ab2c80d037 CEGUI-0.6.2.tar.gz
-5c6b54b9472ffaefc27ed4a9b8fefe25 CEGUI-0.6.2-DOCS.tar.gz
+081782a1005b8d9691970879572897be CEGUI-0.7.4.tar.gz
More information about the scm-commits
mailing list