From 06c6aeeba9c3b32a9f00524ebe5aed21edd9722a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Feb 07 2018 12:43:29 +0000 Subject: Fix FTBFS by disabling the xerces-xmlparser, it is broken with the latest xerces-c version and no-one uses it --- diff --git a/cegui.spec b/cegui.spec index 7ebc5dc..744c44d 100644 --- a/cegui.spec +++ b/cegui.spec @@ -1,6 +1,6 @@ Name: cegui Version: 0.8.7 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Free library providing windowing and widgets for graphics APIs / engines Group: System Environment/Libraries License: MIT @@ -22,7 +22,6 @@ BuildRequires: lua-devel >= 0.5.2 BuildRequires: pcre-devel BuildRequires: pkgconfig >= 0.9.0 BuildRequires: SILLY-devel -BuildRequires: xerces-c-devel BuildRequires: tolua++-devel >= 1.0.93-14 BuildRequires: tinyxml-devel BuildRequires: glew-devel @@ -34,6 +33,8 @@ BuildRequires: graphviz # We no longer build a python subpackage as the python bindings are # broken when building with gcc6 / boost-1.60 and no-one uses them Obsoletes: %{name}-python < %{version}-%{release} +# Idem for the xerces-xmlparser (broken with recent xerces versions) +Obsoletes: %{name}-xerces-xmlparser < %{version}-%{release} %description Crazy Eddie's GUI System is a free library providing windowing and widgets for @@ -54,7 +55,6 @@ Requires: %{name}-ogre-renderer = %{version}-%{release} Requires: %{name}-null-renderer = %{version}-%{release} Requires: %{name}-libxml-xmlparser = %{version}-%{release} Requires: %{name}-tinyxml-xmlparser = %{version}-%{release} -Requires: %{name}-xerces-xmlparser = %{version}-%{release} Requires: libGLU-devel %description devel @@ -143,15 +143,6 @@ Requires: cegui = %{version}-%{release} Alternative xml parsing library for CEGUI using tinyxml. -%package xerces-xmlparser -Summary: Alternative xml parsing library for CEGUI using xerces -Group: System Environment/Libraries -Requires: cegui = %{version}-%{release} - -%description xerces-xmlparser -Alternative xml parsing library for CEGUI using xerces. - - %prep %setup -q %patch0 -p1 @@ -161,10 +152,12 @@ find -name "*.orig" -exec rm -f {} ';' %build %cmake \ -D CMAKE_INSTALL_DOCDIR=%{_pkgdocdir} \ --D CEGUI_BUILD_RENDERER_DIRECTFB=false \ +-D CEGUI_BUILD_IMAGECODEC_SDL2=false \ -D CEGUI_BUILD_IMAGECODEC_STB=false \ -D CEGUI_BUILD_IMAGECODEC_TGA=false \ -D CEGUI_BUILD_PYTHON_MODULES=false \ +-D CEGUI_BUILD_RENDERER_DIRECTFB=false \ +-D CEGUI_BUILD_XMLPARSER_XERCES=false \ -D CEGUI_OPTION_DEFAULT_XMLPARSER=ExpatParser \ -D CEGUI_OPTION_DEFAULT_IMAGECODEC=SILLYImageCodec \ -D CEGUI_BUILD_RENDERER_NULL=true \ @@ -262,11 +255,11 @@ find $RPM_BUILD_ROOT -name "CEGUITests-0.8" -exec rm -f {} ';' %files tinyxml-xmlparser %{_libdir}/cegui-0.8/libCEGUITinyXMLParser.so -%files xerces-xmlparser -%{_libdir}/cegui-0.8/libCEGUIXercesParser.so - - %changelog +* Wed Feb 07 2018 Hans de Goede - 0.8.7-10 +- Fix FTBFS by disabling the xerces-xmlparser, it is broken with the latest + xerces-c version and no-one uses it + * Wed Feb 07 2018 Fedora Release Engineering - 0.8.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild