- rel 1; still TODO applies

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index a50f4db5c3dfadccf3721cfe4d7c8cb7da351947..ad9ec5510722bd3428a7759d043a0da797e227fc 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,3 +1,5 @@
+# TODO:
+# - demos seem to use installed headers instead of these coming from new tarball
 #
 # Conditional build:
 %bcond_without lcd             # without LCD subpixel color filtering (Microsoft patents in USA)
@@ -13,17 +15,17 @@ Summary(pt_BR.UTF-8):       Biblioteca de renderização de fontes TrueType
 Summary(ru.UTF-8):     Растеризатор шрифтов TrueType
 Summary(uk.UTF-8):     Растеризатор шрифтів TrueType
 Name:          freetype
-Version:       2.5.3
+Version:       2.6
 Release:       1
 Epoch:         1
 License:       GPL v2 or FTL
 Group:         Libraries
 Source0:       http://download.savannah.gnu.org/releases/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: d6b60f06bfc046e43ab2a6cbfd171d65
+# Source0-md5: 5682890cb0267f6671dd3de6eabd3e69
 Source1:       http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: e192ef88e84ddf10665f34cf418652fb
+# Source1-md5: f456b7ead3c351c7c218bb3afd45803c
 Source2:       http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: 3d2cd9f572a1a80b9744b9d6b75975ba
+# Source2-md5: c6c209b37f10621d6ff100620b8292b4
 Patch0:                %{name}-2.2.1-enable-valid.patch
 URL:           http://www.freetype.org/
 BuildRequires: automake
@@ -108,6 +110,7 @@ Summary(uk.UTF-8):  Бібліотеки програміста для freetype
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      bzip2-devel
+%{?with_harfbuzz:Requires:     harfbuzz-devel >= 0.9.19}
 Requires:      libpng-devel
 Requires:      zlib-devel
 Obsoletes:     freetype2-devel
@@ -201,6 +204,7 @@ Programy demonstracyjne do biblioteki FreeType.
 %{__sed} -i -e 's,libpng-config --ldflags,libpng-config --libs,' builds/unix/configure
 
 %build
+CC="%{__cc}" \
 CFLAGS="%{rpmcflags} %{rpmcppflags} \
 %{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING} \
 -DTT_CONFIG_OPTION_SUBPIXEL_HINTING \
@@ -209,10 +213,12 @@ CFLAGS="%{rpmcflags} %{rpmcppflags} \
 %{__make} setup unix \
        CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
 
+CC="%{__cc}" \
 %{__make} \
        X11_LIB=%{?_x_libraries}
 
 %if %{with x11}
+CC="%{__cc}" \
 %{__make} -C ft2demos-* \
        TOP_DIR=$(pwd) \
        X11_LIB=%{?_x_libraries}