[mygui] Check for freetype2/freetype.h on fedora > 20 (FTBFS, RHBZ #1106255).
corsepiu
corsepiu at fedoraproject.org
Tue Jun 10 14:43:22 UTC 2014
commit fa1f2c9fdef61a74453ae89ec7ab01c7a28ccc3c
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date: Tue Jun 10 16:43:02 2014 +0200
Check for freetype2/freetype.h on fedora > 20 (FTBFS, RHBZ #1106255).
- Remove BR: autoconf, automake, libtool (unused).
- Remove BR: e2fsprogs-devel (unused).
mygui.spec | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/mygui.spec b/mygui.spec
index adcbb53..260fac7 100644
--- a/mygui.spec
+++ b/mygui.spec
@@ -1,6 +1,6 @@
Name: mygui
Version: 3.2.0
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Fast, simple and flexible GUI library for Ogre
Group: Development/Libraries
# UnitTests include agg-2.4, which is under a BSD variant (not built or installed here)
@@ -21,13 +21,9 @@ Patch0: mygui_multilib_cflags.patch
Patch1: mygui-libCommon-fixup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake, autoconf, libtool, freetype-devel, desktop-file-utils
+BuildRequires: freetype-devel, desktop-file-utils
BuildRequires: ois-devel, ogre-devel, doxygen, graphviz, cmake, dos2unix
-%if 0%{?fedora} < 12
-BuildRequires: e2fsprogs-devel
-%else
BuildRequires: libuuid-devel
-%endif
Requires: dejavu-sans-fonts
@@ -106,6 +102,10 @@ This package contains MyGUI demos; to run the demos, launch the
helper script %{_bindir}/MyGUI-Demos
EOT
+%if %{?fedora} > 20
+# Fedora > 20 has freetype2/freetype.h
+sed -i -e 's,freetype/freetype.h,freetype2/freetype.h,' CMake/Packages/FindFreetype.cmake
+%endif
%build
# Plugins are windows only atm
@@ -246,6 +246,11 @@ rm -rf %{buildroot}
%changelog
+* Tue Jun 10 2014 Ralf Corsépius <corsepiu at fedoraproject.org> - 3.2.0-10
+- Check for freetype2/freetype.h on fedora > 20 (FTBFS, RHBZ #1106255).
+- Remove BR: autoconf, automake, libtool (unused).
+- Remove BR: e2fsprogs-devel (unused).
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list