Stop writing duplicate Requires.private to pc file

Release: 2

diff --git a/harfbuzz.spec b/harfbuzz.spec
index a905ad2d43db1335a06fdce5cb8650aacf971bda..54427a86042272cc2a4dec7e5bdf58f2a713b3f1 100644 (file)
--- a/harfbuzz.spec
+++ b/harfbuzz.spec
@@ -9,11 +9,12 @@ Summary:      HarfBuzz - internationalized text shaping library
 Summary(pl.UTF-8):     HarfBuzz - biblioteka rysująca tekst z obsługą wielu języków
 Name:          harfbuzz
 Version:       1.3.0
-Release:       1
+Release:       2
 License:       MIT
 Group:         Libraries
 Source0:       https://www.freedesktop.org/software/harfbuzz/release/%{name}-%{version}.tar.bz2
 # Source0-md5: a82d49ff67197bc3c96ea34b98880c52
+Patch0:                pc_deps.patch
 URL:           https://www.freedesktop.org/wiki/HarfBuzz
 BuildRequires: autoconf >= 2.64
 BuildRequires: automake >= 1:1.11.1
@@ -28,7 +29,7 @@ BuildRequires:        gtk-doc >= 1.15
 %{?with_icu:BuildRequires:     libicu-devel}
 BuildRequires: libstdc++-devel
 BuildRequires: libtool >= 2:2.2
-BuildRequires: pkgconfig >= 1:0.20
+BuildRequires: pkgconfig >= 1:0.27
 BuildRequires: sed >= 4.0
 Requires:      freetype >= 1:2.4.2
 Requires:      glib2 >= 1:2.16
@@ -177,10 +178,7 @@ Dokumentacja API bibliotek HarfBuzz.
 %prep
 %setup -q
 
-# missing dependencies
-cat >> src/harfbuzz.pc.in <<EOF
-Requires.private: glib-2.0 freetype2%{?with_graphite2: graphite2}
-EOF
+%patch0 -p1
 
 %build
 %{__libtoolize}

diff --git a/pc_deps.patch b/pc_deps.patch
new file mode 100644 (file)
index 0000000..edc36d9
--- /dev/null
+++ b/pc_deps.patch
@@ -0,0 +1,12 @@
+diff -dur harfbuzz-1.3.0.orig/src/Makefile.am harfbuzz-1.3.0/src/Makefile.am
+--- harfbuzz-1.3.0.orig/src/Makefile.am        2016-07-13 04:09:47.000000000 +0200
++++ harfbuzz-1.3.0/src/Makefile.am     2016-09-20 15:11:30.000000000 +0200
+@@ -58,7 +58,7 @@
+ # built with HarfBuzz support enabled.  Newer pkg-config handles that just
+ # fine but pkg-config 0.26 as shipped in Ubuntu 14.04 crashes.  Remove
+ # in a year or two, or otherwise work around it...
+-#HBDEPS   += $(FREETYPE_DEPS)
++HBDEPS   += $(FREETYPE_DEPS)
+ HBSOURCES += $(HB_FT_sources)
+ HBHEADERS += $(HB_FT_headers)
+ endif