- rel 2; apply ft2demos patch in a way that won't require patch updates

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index 0203ee830abf8f52c04773c7ba917822c7671e26..e30ac36f4126d7ad0dea6f83069d380a6c718159 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,10 +1,10 @@
 #
 # Conditional build:
-%bcond_without bytecode        # without TT bytecode interpreter (Apple patents in USA)
 %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
 Summary(es.UTF-8):     Biblioteca de render 3D de fuentes TrueType
 Summary(ko.UTF-8):     자유롭게 어디든 쓸 수 있는 트루타입 글꼴을 다루는 엔진
@@ -13,22 +13,29 @@ 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.3.10
+Version:       2.6.3
 Release:       2
 Epoch:         1
-License:       GPL or FTL
+License:       GPL v2 or FTL
 Group:         Libraries
-Source0:       http://dl.sourceforge.net/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: b7a8a26cc137716a32b788664697d727
-Source1:       http://dl.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: 9bdd83c5b6559bdfb68984f0b3d1dc8c
-Source2:       http://dl.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: e6d762885ecc8222774f5063a1605e45
-Patch0:                %{name}-nprops.patch
+Source0:       http://download.savannah.gnu.org/releases/freetype/%{name}-%{version}.tar.bz2
+# Source0-md5: 0037b25a8c090bc8a1218e867b32beb1
+Source1:       http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
+# Source1-md5: ec2629b81f80decdae04a4b528097b81
+Source2:       http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
+# Source2-md5: f7c6102f29834a80456264fe4edd81d1
+Patch0:                %{name}-2.2.1-enable-valid.patch
+Patch1:                ft2demos-includes.patch
 URL:           http://www.freetype.org/
 BuildRequires: automake
+BuildRequires: bzip2-devel
+%{?with_harfbuzz:BuildRequires:        harfbuzz-devel >= 0.9.19}
+BuildRequires: libpng-devel
+BuildRequires: pkgconfig >= 1:0.24
 BuildRequires: python
+BuildRequires: python-modules
 BuildRequires: rpm >= 4.4.9-56
+BuildRequires: sed >= 4.0
 %if "%{pld_release}" == "ac"
 %{?with_x11:BuildRequires:     XFree86-devel}
 %else
@@ -102,6 +109,9 @@ Summary(ru.UTF-8):  Библиотеки разработчика для freetype
 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
 
@@ -135,6 +145,9 @@ rodar aplicações existentes, você não precisa deste pacote.
 Summary:       FreeType API documetation
 Summary(pl.UTF-8):     Dokumentacja API FreeType
 Group:         Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description apidocs
 FreeType API documetation.
@@ -189,18 +202,29 @@ Programy demonstracyjne do biblioteki FreeType.
 %prep
 %setup -q -a1 -a2
 %patch0 -p1
+cd ft2demos-%{version}
+%patch1 -p2
+cd ..
+
+# avoid propagating -L%{_libdir} through *.la
+%{__sed} -i -e 's,libpng-config --ldflags,libpng-config --libs,' builds/unix/configure
 
 %build
-CFLAGS="%{rpmcflags} \
-%{?with_bytecode:-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER} \
-%{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING}" \
+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}
@@ -216,7 +240,7 @@ install -d $RPM_BUILD_ROOT%{_bindir}
        DESTDIR=$RPM_BUILD_ROOT
 
 %if %{with x11}
-install ft2demos-*/bin/.libs/ft* $RPM_BUILD_ROOT%{_bindir}
+install -p ft2demos-*/bin/.libs/ft* $RPM_BUILD_ROOT%{_bindir}
 %endif
 
 %clean
@@ -227,7 +251,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc docs/{CHANGES,FTL.TXT,LICENSE.TXT,PATENTS,TODO,formats.txt,raster.txt}
+%doc docs/{CHANGES,FTL.TXT,LICENSE.TXT,TODO,formats.txt,raster.txt}
 %attr(755,root,root) %{_libdir}/libfreetype.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfreetype.so.6
 
@@ -238,9 +262,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