[freetype] - drop private libs from freetype-config so it returns the same libs as pkg-config

Dan Horák sharkcz at fedoraproject.org
Fri Mar 21 11:14:23 UTC 2014


commit 27e95cfb6b12cd205b923a748b4a1fc9f2f369b7
Author: Dan Horák <dan at danny.cz>
Date:   Fri Mar 21 12:14:20 2014 +0100

    - drop private libs from freetype-config so it returns the same libs as pkg-config

 freetype.spec |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/freetype.spec b/freetype.spec
index 8bcc7f8..6f1c750 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -66,8 +66,6 @@ small utilities showing various capabilities of the FreeType library.
 Summary: FreeType development libraries and header files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: zlib-devel
-Requires: pkgconfig
 
 %description devel
 The freetype-devel package includes the static libraries and header files
@@ -124,6 +122,9 @@ popd
 rm -rf $RPM_BUILD_ROOT
 
 
+# HACK - drop private libs from freetype-config --libs option
+sed -i -e 's| -lz -lbz2 -lpng16||' builds/unix/freetype-config
+
 %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale
 
 {
@@ -214,6 +215,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Fri Mar 21 2014 Dan Horák <dan[at]danny.cz> - 2.5.3-3
+- drop private libs from freetype-config so it returns the same libs as pkg-config
+
 * Tue Mar 11 2014 Marek Kasik <mkasik at redhat.com> - 2.5.3-2
 - Enable support for bzip2 compressed fonts
 


More information about the fonts-bugs mailing list