From 5a71e5cb382052254ee49c45828e31e51f31e1e69f530e7826e2c16ee4053b13 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 18 May 2015 09:49:04 +0000 Subject: [PATCH] reverted OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/harfbuzz?expand=0&rev=78 --- harfbuzz.changes | 8 ++------ harfbuzz.spec | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/harfbuzz.changes b/harfbuzz.changes index bd602dd..54f0b3f 100644 --- a/harfbuzz.changes +++ b/harfbuzz.changes @@ -1,12 +1,8 @@ ------------------------------------------------------------------- Tue May 5 08:28:46 UTC 2015 - fstrba@suse.com -- Kill the harfbuzz-bootstrap package again - - The new sequence will be: - -> freetype2-bootstrap - -> fontconfig - -> harfbuzz - -> freetype2 +- Revert the introduction of harfbuzz-bootstrap: it did not help to + work around the cycle. ------------------------------------------------------------------- Mon Apr 27 09:44:21 UTC 2015 - dimstar@opensuse.org diff --git a/harfbuzz.spec b/harfbuzz.spec index 90d0358..b053648 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -27,17 +27,15 @@ Source: http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-%{ Source99: baselibs.conf BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: freetype2-bootstrap-devel BuildRequires: pkgconfig(cairo) >= 1.8.0 BuildRequires: pkgconfig(cairo-ft) +BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(glib-2.0) >= 2.16 BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(graphite2) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(icu-le) BuildRequires: pkgconfig(icu-uc) -#!BuildIgnore: libfreetype6 -#!BuildIgnore: freetype2-devel %description HarfBuzz is an OpenType text shaping engine.