rpms/cegui/F-7 .cvsignore, 1.2, 1.3 cegui.spec, 1.4, 1.5 sources, 1.2, 1.3 cegui_mk2-0.4.1-64bit.patch, 1.1, NONE cegui_mk2-0.4.1-fixheader.patch, 1.1, NONE cegui_mk2-0.4.1-fixtinyxml.patch, 1.1, NONE cegui_mk2-0.4.1-pcre.patch, 1.1, NONE cegui_mk2-0.4.1-tolua++.patch, 1.1, NONE cegui_mk2-0.4.1-useverso.patch, 1.1, NONE

[Ian Chapman (oddsocks)]

Author: oddsocks

Update of /cvs/extras/rpms/cegui/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32016

Modified Files:
	.cvsignore cegui.spec sources 
Removed Files:
	cegui_mk2-0.4.1-64bit.patch cegui_mk2-0.4.1-fixheader.patch 
	cegui_mk2-0.4.1-fixtinyxml.patch cegui_mk2-0.4.1-pcre.patch 
	cegui_mk2-0.4.1-tolua++.patch cegui_mk2-0.4.1-useverso.patch 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cegui/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Jun 2006 21:19:57 -0000	1.2
+++ .cvsignore	30 Jun 2007 18:03:40 -0000	1.3
@@ -1 +1,2 @@
-cegui_mk2-source-0.4.1.tar.bz2
+CEGUI-DOCS-0.5.0.tar.gz
+CEGUI-0.5.0b.tar.gz


Index: cegui.spec
===================================================================
RCS file: /cvs/extras/rpms/cegui/F-7/cegui.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cegui.spec	28 Aug 2006 23:13:27 -0000	1.4
+++ cegui.spec	30 Jun 2007 18:03:40 -0000	1.5
@@ -1,28 +1,33 @@
+%define         VER 0.5.0
+
 Name:           cegui
-Version:        0.4.1
-Release:        11%{?dist}
+Version:        %{VER}b
+Release:        3%{?dist}
 Summary:        Free library providing windowing and widgets for graphics APIs / engines
-
 Group:          System Environment/Libraries
-License:        LGPL
-URL:            http://www.cegui.org.uk/
-Source0:        http://dl.sf.net/crayzedsgui/%{name}_mk2-source-%{version}.tar.bz2
-Patch0:         cegui_mk2-0.4.1-pcre.patch
-Patch1:         cegui_mk2-0.4.1-tolua++.patch
-Patch2:         cegui_mk2-0.4.1-fixtinyxml.patch
-Patch3:         cegui_mk2-0.4.1-64bit.patch
-Patch4:         cegui_mk2-0.4.1-useverso.patch
-Patch5:         cegui_mk2-0.4.1-fixheader.patch
+License:        MIT
+URL:            http://www.cegui.org.uk
+Source0:        http://dl.sf.net/crayzedsgui/CEGUI-%{version}.tar.gz
+Source1:        http://dl.sf.net/crayzedsgui/CEGUI-DOCS-%{VER}.tar.gz
+Patch0:         cegui-0.5.0-userverso.patch
+Patch1:         cegui-0.5.0-lua51.patch
+Patch2:         cegui-0.5.0-fixweaksymbol.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gawk
-BuildRequires:  freetype-devel > 2.0.0
+BuildRequires:  autoconf
+BuildRequires:  automake17
 BuildRequires:  DevIL-devel
+BuildRequires:  expat-devel
+BuildRequires:  freetype-devel > 2.0.0
+BuildRequires:  libxml2-devel
+BuildRequires:  libICE-devel
+BuildRequires:  libGLU-devel
+BuildRequires:  libtool
+BuildRequires:  libSM-devel
+BuildRequires:  lua-devel >= 0.5.1
 BuildRequires:  pcre-devel
 BuildRequires:  pkgconfig >= 0.9.0
-BuildRequires:  libGLU-devel
-BuildRequires:  tolua++-devel
-Provides:       CEGUI = %{version}-%{release}
-Provides:       cegui_mk2 = %{version}-%{release}
+BuildRequires:  SILLY-devel
+BuildRequires:  xerces-c-devel
 
 %description
 Crazy Eddie's GUI System is a free library providing windowing and widgets for
@@ -31,14 +36,12 @@
 targeted at games developers who should be spending their time creating great
 games, not building GUI sub-systems!
 
+
 %package devel
 Summary:        Development files for cegui
 Group:          Development/Libraries
-Requires:       cegui = %{version}-%{release}
-Requires:       pkgconfig
+Requires:       %{name} = %{version}-%{release}
 Requires:       libGLU-devel
-Provides:       CEGUI-devel = %{version}-%{release}
-Provides:       cegui_mk2-devel = %{version}-%{release}
 
 %description devel
 Development files for cegui
@@ -48,50 +51,41 @@
 Summary:        API documentation for cegui
 Group:          Documentation
 Requires:       cegui-devel = %{version}-%{release}
-Provides:       CEGUI-devel-doc = %{version}-%{release}
-Provides:       cegui_mk2-devel-doc = %{version}-%{release}
-Provides:       cegui-devel-docs = %{version}-%{release}
-Obsoletes:      cegui-devel-docs
 
 %description devel-doc
 API and Falagard skinning documentation for cegui
 
 
 %prep
-%setup -q -n %{name}_mk2
+%setup -qb1 -qn CEGUI-%{VER}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-#Delete bundled pcre to avoid any accidental building against it.
-rm -rf src/pcre
-#Delete bundled lua / tolua++ to avoid any accidental building against it.
-rm -rf ScriptingModules/CEGUILua/lua_and_tolua++
-#Fix documentation link in html file
-sed -i 's/documentation\/api_reference/api_reference/' ReadMe.html
 
+# Permission fixes for debuginfo RPM
+chmod -x include/falagard/*.h
+
+# Delete zero length file
+rm -f documentation/api_reference/keepme
+
+# Run automake/autoconf due to patches 1 & 2
+touch INSTALL NEWS
+automake-1.7
+autoconf
 
 %build
-#Regenerate bindings with system tolua++. The reason for the change directory
-#(pushd) before calling tolua++, is because tolua++ only looks in the current
-#directory for the files depended on my CEGUI.pkg. If a full path is specified,
-#it fails.
-pushd ScriptingModules/CEGUILua/LuaScriptModule/package/
-tolua++ -o ../src/lua_CEGUI.cpp CEGUI.pkg
-popd
-%configure --disable-irrlicht-renderer --disable-samples --with-pic --without-xerces-c
-make %{?_smp_mflags}
+%configure --disable-static --disable-corona --enable-devil \
+           --enable-lua-module --disable-irrlicht-renderer --disable-samples \
+           --with-default-xml-parser=ExpatParser --enable-silly \
+           --with-default-image-codec=SILLYImageCodec --with-pic
+
+make %{?_smp_mflags} LIBTOOL="/usr/bin/libtool"
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-rm -f %{buildroot}%{_libdir}/*.la %{buildroot}%{_libdir}/*.a
-rm -rf %{buildroot}%{_includedir}/CEGUI/renderers/IrrlichtRenderer
-#Cleanup CVS stuff in the documentation area before the %%doc section
-rm -rf documentation/CVS documentation/api_reference/CVS documentation/api_reference/keepme documentation/api_reference/*.md5
+# Strange but FC6 needs libtool here also on x86_64 to avoid rpath problems.
+make install DESTDIR=%{buildroot} LIBTOOL="/usr/bin/libtool"
 
 
 %clean
@@ -104,44 +98,62 @@
 
 %files
 %defattr(-,root,root,-)
-%{_libdir}/libCEGUIBase.so.0
-%{_libdir}/libCEGUIBase.so.0.0.0
-%{_libdir}/libCEGUIFalagardBase.so.0
-%{_libdir}/libCEGUIFalagardBase.so.0.0.0
-%{_libdir}/libCEGUILuaScriptModule.so.0
-%{_libdir}/libCEGUILuaScriptModule.so.0.0.0
-%{_libdir}/libCEGUIOpenGLRenderer.so.0
-%{_libdir}/libCEGUIOpenGLRenderer.so.0.0.0
-%{_libdir}/libCEGUITaharezLook.so.0
-%{_libdir}/libCEGUITaharezLook.so.0.0.0
-%{_libdir}/libCEGUIWindowsLook.so.0
-%{_libdir}/libCEGUIWindowsLook.so.0.0.0
-#The pristine sources generate this library, which is not needed when building
-#against the system tolua++/lua.
-##%%{_libdir}/libCEGUIluatoluapp.so.0
-##%%{_libdir}/libCEGUIluatoluapp.so.0.0.0
-%doc AUTHORS COPYING README TinyXML-License
+%{_libdir}/libCEGUIBase.so.1*
+%{_libdir}/libCEGUIDevILImageCodec.so.0*
+%{_libdir}/libCEGUIExpatParser.so.0*
+%{_libdir}/libCEGUIFalagardWRBase.so.1*
+%{_libdir}/libCEGUILibxmlParser.so.0*
+%{_libdir}/libCEGUILuaScriptModule.so.1*
+%{_libdir}/libCEGUIOpenGLRenderer.so.0*
+%{_libdir}/libCEGUITGAImageCodec.so.0*
+%{_libdir}/libCEGUITinyXMLParser.so.0*
+%{_libdir}/libCEGUIXercesParser.so.0*
+%{_libdir}/libCEGUISILLYImageCodec.so.0*
+%{_libdir}/libCEGUItoluapp.so.1*
+%exclude %{_libdir}/*.la
+%exclude %{_libdir}/*.a
+%doc AUTHORS ChangeLog COPYING README TinyXML-License TODO
+
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libCEGUIBase.so
-%{_libdir}/libCEGUIFalagardBase.so
+%{_libdir}/libCEGUIDevILImageCodec.so
+%{_libdir}/libCEGUIExpatParser.so
+%{_libdir}/libCEGUIFalagardWRBase.so
+%{_libdir}/libCEGUILibxmlParser.so
 %{_libdir}/libCEGUILuaScriptModule.so
 %{_libdir}/libCEGUIOpenGLRenderer.so
-%{_libdir}/libCEGUITaharezLook.so
-%{_libdir}/libCEGUIWindowsLook.so
-#The pristine sources generate this library , which is not needed when building
-#against the system tolua++/lua.
-#%%{_libdir}/libCEGUIluatoluapp.so
+%{_libdir}/libCEGUITGAImageCodec.so
+%{_libdir}/libCEGUITinyXMLParser.so
+%{_libdir}/libCEGUIXercesParser.so
+%{_libdir}/libCEGUISILLYImageCodec.so
+%{_libdir}/libCEGUItoluapp.so
 %{_libdir}/pkgconfig/CEGUI-OPENGL.pc
 %{_libdir}/pkgconfig/CEGUI.pc
 %{_includedir}/CEGUI
 
+
 %files devel-doc
-%doc documentation/Falagard_Skinning_Docs.pdf documentation/api_reference
+%doc documentation/FalagardSkinning.pdf documentation/api_reference
 
 
 %changelog
+* Sun Jun 17 2007 Ian Chapman <packages at amiga-hardware.com> 0.5.0b-3%{?dist}
+- rpath fixes for x86_64
+
+* Sun Jun 10 2007 Ian Chapman <packages at amiga-hardware.com> 0.5.0b-2%{?dist}
+- Added patch to fix undefined-non-weak-symbol warnings
+
+* Wed May 30 2007 Ian Chapman <packages at amiga-hardware.com> 0.5.0b-1%{?dist}
+- Upgrade to 0.5.0b
+- Added patch from Gentoo to compile with lua 5.1
+- Updated the patch to use versioned .so for dlopen()
+- Dropped several patches as they are no longer needed
+- Dropped useless provides. Nothing used them anyway
+- Added support for the SILLY image codec
+- Added support for xerces-c
+
 * Mon Aug 28 2006 Ian Chapman <packages at amiga-hardware.com> 0.4.1-11%{?dist}
 - Release bump for FC6 mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cegui/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Jun 2006 21:19:57 -0000	1.2
+++ sources	30 Jun 2007 18:03:40 -0000	1.3
@@ -1 +1,2 @@
-7b1df5ba4dd91376b79bd5968a429e23  cegui_mk2-source-0.4.1.tar.bz2
+e268b5812f146ee1ff9ba4c07ff501b7  CEGUI-DOCS-0.5.0.tar.gz
+b42322a33c6a06eede76b15f75694a17  CEGUI-0.5.0b.tar.gz


--- cegui_mk2-0.4.1-64bit.patch DELETED ---


--- cegui_mk2-0.4.1-fixheader.patch DELETED ---


--- cegui_mk2-0.4.1-fixtinyxml.patch DELETED ---


--- cegui_mk2-0.4.1-pcre.patch DELETED ---


--- cegui_mk2-0.4.1-tolua++.patch DELETED ---


--- cegui_mk2-0.4.1-useverso.patch DELETED ---