From 9dcacc348a304f864e4d46dfb860b1f7c3f166639327d2f2e200af661aeccde1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Fri, 31 May 2013 18:35:13 +0000
Subject: [PATCH] Accepting request 176912 from
 home:dimstar:branches:GNOME:Factory

Update to 0.9.18

OBS-URL: https://build.opensuse.org/request/show/176912
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/harfbuzz?expand=0&rev=30
---
 baselibs.conf           |  1 +
 harfbuzz-0.9.17.tar.bz2 |  3 ---
 harfbuzz-0.9.18.tar.bz2 |  3 +++
 harfbuzz.changes        | 18 ++++++++++++++++++
 harfbuzz.spec           | 25 +++++++++++++++++++++----
 5 files changed, 43 insertions(+), 7 deletions(-)
 delete mode 100644 harfbuzz-0.9.17.tar.bz2
 create mode 100644 harfbuzz-0.9.18.tar.bz2

diff --git a/baselibs.conf b/baselibs.conf
index b733ce8..a5c4173 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,2 @@
 libharfbuzz0
+libharfbuzz-icu0
diff --git a/harfbuzz-0.9.17.tar.bz2 b/harfbuzz-0.9.17.tar.bz2
deleted file mode 100644
index b239209..0000000
--- a/harfbuzz-0.9.17.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a4773003512035cb5c559de23e1d53f292bcb0212f023b540c4dc695b39690ed
-size 902229
diff --git a/harfbuzz-0.9.18.tar.bz2 b/harfbuzz-0.9.18.tar.bz2
new file mode 100644
index 0000000..9a21b29
--- /dev/null
+++ b/harfbuzz-0.9.18.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fef0fbbc6d6492cb4074a5e26a699d87d88bef8adc25dda62af6077735a7d908
+size 902395
diff --git a/harfbuzz.changes b/harfbuzz.changes
index 977b366..78f6df3 100644
--- a/harfbuzz.changes
+++ b/harfbuzz.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Wed May 29 06:21:15 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 0.9.18:
+  + All unneeded code is disabled by default.
+  + Uniscribe and CoreText shapers can be enabled with their --with
+    options.
+  + icu_le and old shapers cannot be enabled for now.
+  + glib, freetype, and cairo will be detected automatically.
+  + icu and graphite2 are default off, can be enabled with their
+    --with options.
+- Split out new library package, libharfbuzz-icu0.
+- Pass parameters --with-glib, --with-freetype, --with-cairo,
+  --with-icu and --with-graphite2 to configure, as advised by
+  upstream.
+- Enable pkgconfig(graphite2) BuildRequires, as the depdency is now
+  available in openSUSE.
+
 -------------------------------------------------------------------
 Wed May 22 12:19:17 UTC 2013 - dimstar@opensuse.org
 
diff --git a/harfbuzz.spec b/harfbuzz.spec
index d684af3..cfeff6b 100644
--- a/harfbuzz.spec
+++ b/harfbuzz.spec
@@ -17,9 +17,8 @@
 
 
 Name:           harfbuzz
-Version:        0.9.17
+Version:        0.9.18
 Release:        0
-# FIXME: graphite2 is not packaged / http://projects.palaso.org/projects/graphitedev
 Summary:        An OpenType text shaping engine
 License:        MIT
 Group:          Productivity/Text/Utilities
@@ -32,7 +31,7 @@ BuildRequires:  pkgconfig(cairo-ft)
 BuildRequires:  pkgconfig(freetype2) >= 2.3.8
 BuildRequires:  pkgconfig(glib-2.0) >= 2.16
 BuildRequires:  pkgconfig(gobject-2.0)
-#BuildRequires:  pkgconfig(graphite2)
+BuildRequires:  pkgconfig(graphite2)
 BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(icu-le)
 BuildRequires:  pkgconfig(icu-uc)
@@ -48,6 +47,13 @@ Group:          System/Libraries
 %description -n libharfbuzz0
 HarfBuzz is an OpenType text shaping engine.
 
+%package -n libharfbuzz-icu0
+Summary:        An OpenType text shaping engine - ICU library
+Group:          System/Libraries
+
+%description -n libharfbuzz-icu0
+HarfBuzz is an OpenType text shaping engine.
+
 %package tools
 Summary:        An OpenType text shaping engine -- Tools
 Group:          Productivity/Text/Utilities
@@ -58,6 +64,7 @@ HarfBuzz is an OpenType text shaping engine.
 %package devel
 Summary:        An OpenType text shaping engine -- Development Files
 Group:          Development/Libraries/C and C++
+Requires:       libharfbuzz-icu0 = %{version}
 Requires:       libharfbuzz0 = %{version}
 
 %description devel
@@ -68,7 +75,12 @@ HarfBuzz is an OpenType text shaping engine.
 
 %build
 %configure \
-        --disable-static
+        --disable-static \
+        --with-glib \
+        --with-freetype \
+        --with-cairo \
+        --with-icu \
+        --with-graphite2
 make %{?_smp_mflags}
 
 %install
@@ -84,6 +96,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %doc AUTHORS COPYING NEWS README THANKS
 %{_libdir}/libharfbuzz.so.0*
 
+%files -n libharfbuzz-icu0
+%defattr(-,root,root)
+%{_libdir}/libharfbuzz-icu.so.0*
+
 %files tools
 %defattr(-,root,root)
 %{_bindir}/hb-ot-shape-closure
@@ -95,5 +111,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_includedir}/harfbuzz/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/harfbuzz.pc
+%{_libdir}/pkgconfig/harfbuzz-icu.pc
 
 %changelog