- updated to 0.6.1 (docs still 0.6.0)

- updated link patch is back, removed obsolete gcc33,irrlicht patches

Changed files:
    CEGUI.spec -> 1.19

diff --git a/CEGUI.spec b/CEGUI.spec
index 06ab5e7785f488fb123b3f5f2b2805234a399824..39b46c2dc69b0621617de5476f55f04f4ed330c8 100644 (file)
--- a/CEGUI.spec
+++ b/CEGUI.spec
@@ -1,5 +1,6 @@
 # TODO:
-# - gcc33 patch only for AC-branch
+# - external tinyxml
+# - external tolua++
 # - ogre-renderer (BR: CEGUI-OGRE >= 1.0.0 through pkgconfig)
 # - maybe we should make subpackages? For example CEGUI-OPENGL (smc.spec)?
 #
@@ -11,17 +12,16 @@
 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.6.0
+Version:       0.6.1
 Release:       1
 License:       LGPL v2.1+ (with MIT parts)
 Group:         Libraries
 Source0:       http://dl.sourceforge.net/crayzedsgui/%{name}-%{version}.tar.gz
-# Source0-md5: a7772b20a4e3530298e3e28c4eaec1bb
-Source1:       http://dl.sourceforge.net/crayzedsgui/%{name}-DOCS-%{version}.tar.gz
+# Source0-md5: aee37f8532ecbdc0b87efbaebafdf148
+#Source1:      http://dl.sourceforge.net/crayzedsgui/%{name}-DOCS-%{version}.tar.gz
+Source1:       http://dl.sourceforge.net/crayzedsgui/%{name}-DOCS-0.6.0.tar.gz
 # Source1-md5: 8abece86ea0b8a52737579ac2e801978
-Patch0:                %{name}-gcc33.patch
-Patch1:                %{name}-link.patch
-Patch2:                %{name}-irrlicht.patch
+Patch0:                %{name}-link.patch
 URL:           http://www.cegui.org.uk/
 BuildRequires: DevIL-devel
 BuildRequires: FreeImage-devel
@@ -33,23 +33,24 @@ BuildRequires:      automake
 BuildRequires: corona-devel >= 1.0.2
 BuildRequires: expat-devel
 BuildRequires: freetype-devel >= 2.0
+BuildRequires: glew-devel
 BuildRequires: irrlicht-devel >= 1.4
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:1.5
 BuildRequires: libxml2-devel >= 1:2.6
-BuildRequires: lua50-devel >= 5.0
-BuildRequires: pcre-devel >= 5.0
-BuildRequires: pkgconfig
+BuildRequires: lua51-devel >= 5.1
 %if %{with ogre}
+BuildRequires: ogre-devel >= 1.0.0
 BuildRequires: ois-devel
-BuildRequires: ogre-devel
 %endif
+BuildRequires: pcre-devel >= 5.0
+BuildRequires: pkgconfig
 # for irrlicht renderer
 BuildRequires: xorg-lib-libXxf86vm-devel
-Requires:      irrlicht >= 1.4
 %if %{with xercesc}
 BuildRequires: xerces-c-devel
 %endif
+Requires:      irrlicht >= 1.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -99,8 +100,6 @@ Dokumentacja CEGUI.
 %prep
 %setup -q -b 1
 %patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -110,7 +109,7 @@ Dokumentacja CEGUI.
 %{__automake}
 %configure \
        --with-default-image-codec=FreeImageImageCodec \
-       --with-default-parser=LibxmlParser \
+       --with-default-xml-parser=LibxmlParser \
        %{!?with_samples:--disable-samples} \
        %{!?with_ogre:--without-ogre-renderer} \
        --%{?with_xercesc:en}%{!?with_xercesc:dis}able-xerces-c
@@ -132,19 +131,51 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README
-%attr(755,root,root) %{_libdir}/libCEGUI*.so.*
+# libs
+%attr(755,root,root) %{_libdir}/libCEGUIBase.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUIBase.so.1
+%attr(755,root,root) %{_libdir}/libCEGUIOpenGLRenderer.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUIOpenGLRenderer.so.0
+# plugins
+%attr(755,root,root) %{_libdir}/libCEGUICoronaImageCodec.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUICoronaImageCodec.so.0
+%attr(755,root,root) %{_libdir}/libCEGUICoronaImageCodec.so
+%attr(755,root,root) %{_libdir}/libCEGUIDevILImageCodec.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUIDevILImageCodec.so.0
 %attr(755,root,root) %{_libdir}/libCEGUIDevILImageCodec.so
+%attr(755,root,root) %{_libdir}/libCEGUIExpatParser.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUIExpatParser.so.0
 %attr(755,root,root) %{_libdir}/libCEGUIExpatParser.so
+%attr(755,root,root) %{_libdir}/libCEGUIFalagardWRBase.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUIFalagardWRBase.so.1
 %attr(755,root,root) %{_libdir}/libCEGUIFalagardWRBase.so
+%attr(755,root,root) %{_libdir}/libCEGUIFreeImageImageCodec.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUIFreeImageImageCodec.so.0
 %attr(755,root,root) %{_libdir}/libCEGUIFreeImageImageCodec.so
+%attr(755,root,root) %{_libdir}/libCEGUIIrrlichtRenderer.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUIIrrlichtRenderer.so.0
 %attr(755,root,root) %{_libdir}/libCEGUIIrrlichtRenderer.so
+%attr(755,root,root) %{_libdir}/libCEGUILibxmlParser.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUILibxmlParser.so.0
 %attr(755,root,root) %{_libdir}/libCEGUILibxmlParser.so
+%attr(755,root,root) %{_libdir}/libCEGUILuaScriptModule.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUILuaScriptModule.so.1
 %attr(755,root,root) %{_libdir}/libCEGUILuaScriptModule.so
+%attr(755,root,root) %{_libdir}/libCEGUISILLYImageCodec.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUISILLYImageCodec.so.0
 %attr(755,root,root) %{_libdir}/libCEGUISILLYImageCodec.so
+%attr(755,root,root) %{_libdir}/libCEGUITGAImageCodec.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUITGAImageCodec.so.0
 %attr(755,root,root) %{_libdir}/libCEGUITGAImageCodec.so
+%attr(755,root,root) %{_libdir}/libCEGUITinyXMLParser.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUITinyXMLParser.so.0
 %attr(755,root,root) %{_libdir}/libCEGUITinyXMLParser.so
-%attr(755,root,root) %{_libdir}/libCEGUItoluapp.so
+%attr(755,root,root) %{_libdir}/libCEGUIXercesParser.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUIXercesParser.so.0
 %attr(755,root,root) %{_libdir}/libCEGUIXercesParser.so
+%attr(755,root,root) %{_libdir}/libCEGUItoluapp.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libCEGUItoluapp.so.1
+%attr(755,root,root) %{_libdir}/libCEGUItoluapp.so
 
 %files docs
 %doc documentation
@@ -157,7 +188,22 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libCEGUIBase.so
 %attr(755,root,root) %{_libdir}/libCEGUIOpenGLRenderer.so
-%{_libdir}/libCEGUI*.la
+%{_libdir}/libCEGUIBase.la
+%{_libdir}/libCEGUIOpenGLRenderer.la
+# plugins - but as their headers are included...
+%{_libdir}/libCEGUICoronaImageCodec.la
+%{_libdir}/libCEGUIDevILImageCodec.la
+%{_libdir}/libCEGUIExpatParser.la
+%{_libdir}/libCEGUIFalagardWRBase.la
+%{_libdir}/libCEGUIFreeImageImageCodec.la
+%{_libdir}/libCEGUIIrrlichtRenderer.la
+%{_libdir}/libCEGUILibxmlParser.la
+%{_libdir}/libCEGUILuaScriptModule.la
+%{_libdir}/libCEGUISILLYImageCodec.la
+%{_libdir}/libCEGUITGAImageCodec.la
+%{_libdir}/libCEGUITinyXMLParser.la
+%{_libdir}/libCEGUIXercesParser.la
+%{_libdir}/libCEGUItoluapp.la
 %{_includedir}/%{name}
 %{_pkgconfigdir}/CEGUI.pc
 %{_pkgconfigdir}/CEGUI-OPENGL.pc