commit e78513b38859291e60b30cd0cdacc3b89d229162 Author: Marek Kasik mkasik@redhat.com Date: Mon May 13 14:47:32 2013 +0200
Don't use quotes in freetype2.pc
Resolves: #961855
freetype-2.4.12-pkgconfig.patch | 14 ++++++++++++++ freetype.spec | 11 ++++++++++- 2 files changed, 24 insertions(+), 1 deletions(-) --- diff --git a/freetype-2.4.12-pkgconfig.patch b/freetype-2.4.12-pkgconfig.patch new file mode 100644 index 0000000..397a003 --- /dev/null +++ b/freetype-2.4.12-pkgconfig.patch @@ -0,0 +1,14 @@ +--- freetype-2.4.12/builds/unix/freetype2.in ++++ freetype-2.4.12/builds/unix/freetype2.in +@@ -1,7 +1,7 @@ +-prefix="%prefix%" +-exec_prefix="%exec_prefix%" +-libdir="%libdir%" +-includedir="%includedir%" ++prefix=%prefix% ++exec_prefix=%exec_prefix% ++libdir=%libdir% ++includedir=%includedir% + + Name: FreeType 2 + Description: A free, high-quality, and portable font engine. diff --git a/freetype.spec b/freetype.spec index cd95f4c..293ab74 100644 --- a/freetype.spec +++ b/freetype.spec @@ -7,7 +7,7 @@ Summary: A free and portable font rendering engine Name: freetype Version: 2.4.12 -Release: 1%{?dist} +Release: 2%{?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 @@ -28,6 +28,9 @@ Patch88: freetype-multilib.patch # https://bugzilla.redhat.com/show_bug.cgi?id=959771 Patch89: freetype-2.4.12-enable-adobe-cff-engine.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=961855 +Patch90: freetype-2.4.12-pkgconfig.patch + Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires: libX11-devel @@ -90,6 +93,8 @@ popd
%patch89 -p1 -b .adobe-cff
+%patch90 -p1 -b .pkgconfig + %build
%configure --disable-static @@ -221,6 +226,10 @@ rm -rf $RPM_BUILD_ROOT %doc docs/tutorial
%changelog +* Mon May 13 2013 Marek Kasik mkasik@redhat.com - 2.4.12-2 +- Don't use quotes in freetype2.pc +- Resolves: #961855 + * Thu May 9 2013 Marek Kasik mkasik@redhat.com - 2.4.12-1 - Update to 2.4.12 - Enable Adobe CFF engine