- rel 1; still TODO applies

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index 3181800797254ee826a607a1020ad025dc7f3187..ad9ec5510722bd3428a7759d043a0da797e227fc 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,7 +1,10 @@
+# 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)
 %bcond_without x11             # don't build examples (X11-based)
+%bcond_without harfbuzz        # harfbuzz based autohinting
 %bcond_without apidocs         # disable api docs
 
 Summary:       TrueType font rasterizer
@@ -12,21 +15,22 @@ 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.0.1
+Version:       2.6
 Release:       1
 Epoch:         1
 License:       GPL v2 or FTL
 Group:         Libraries
-Source0:       http://downloads.sourceforge.net/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: c72e9010b1d986d556fc0b2b5fcbf31a
-Source1:       http://downloads.sourceforge.net/freetype/%{name}-doc-2.5.0.tar.bz2
-# Source1-md5: 40f3d5cc0b16396b3fb6b98eeaa053b2
-Source2:       http://downloads.sourceforge.net/freetype/ft2demos-2.5.0.tar.bz2
-# Source2-md5: 9bbea1989116715d3544d8439c8d2972
-Patch0:                freetype-2.2.1-enable-valid.patch
+Source0:       http://download.savannah.gnu.org/releases/freetype/%{name}-%{version}.tar.bz2
+# Source0-md5: 5682890cb0267f6671dd3de6eabd3e69
+Source1:       http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
+# Source1-md5: f456b7ead3c351c7c218bb3afd45803c
+Source2:       http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
+# Source2-md5: c6c209b37f10621d6ff100620b8292b4
+Patch0:                %{name}-2.2.1-enable-valid.patch
 URL:           http://www.freetype.org/
 BuildRequires: automake
 BuildRequires: bzip2-devel
+%{?with_harfbuzz:BuildRequires:        harfbuzz-devel >= 0.9.19}
 BuildRequires: libpng-devel
 BuildRequires: python
 BuildRequires: python-modules
@@ -106,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
@@ -199,17 +204,21 @@ 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 \
+%{?with_harfbuzz:-DFT_CONFIG_OPTION_USE_HARFBUZZ} \
 " \
 %{__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}
@@ -224,6 +233,8 @@ install -d $RPM_BUILD_ROOT%{_bindir}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+ln -s . $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype
+
 %if %{with x11}
 install -p ft2demos-*/bin/.libs/ft* $RPM_BUILD_ROOT%{_bindir}
 %endif
@@ -247,9 +258,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libfreetype.so
 %{_libdir}/libfreetype.la
 %{_includedir}/freetype2
-%{_includedir}/ft2build.h
 %{_aclocaldir}/freetype2.m4
 %{_pkgconfigdir}/freetype2.pc
+%{_mandir}/man1/freetype-config.1*
 
 %if %{with apidocs}
 %files apidocs