- setting cc breaks things (and no time to investigate now; revert)

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index 271377cce43d188096cd09aec4895b74438c2afa..f5b8d8a533fbc29d1b80736362e28ab3da9cf9f9 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -3,7 +3,7 @@
 %bcond_without bytecode        # without TT bytecode interpreter
 #               (patents pending in USA, Japan etc., but now it includes
 #                also patent-free hinting workaround)
-%bcond_without x11
+%bcond_without x11             # don't build examples (X11-based)
 #
 Summary:       TrueType font rasterizer
 Summary(es):   Biblioteca de render 3D de fuentes TrueType
@@ -13,25 +13,29 @@ Summary(pt_BR):     Biblioteca de renderiza
 Summary(ru):   òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔÏ× TrueType
 Summary(uk):   òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔ¦× TrueType
 Name:          freetype
-Version:       2.1.7
-Release:       3
+Version:       2.1.9
+Release:       1
+Epoch:         1
 License:       GPL or FTL
 Group:         Libraries
 Source0:       ftp://ftp.freetype.org/freetype/freetype2/%{name}-%{version}.tar.bz2
-# Source0-md5: d5c39853f6741c8401bfe272478958a8
+# Source0-md5: ec1b903e4be5f073caa72458ea58c29c
 Source1:       ftp://ftp.freetype.org/freetype/freetype2/ftdocs-%{version}.tar.bz2
-# Source1-md5: 56579e3610482522061cfafbb788a81b
+# Source1-md5: db77177afe35955f55bcaa2953724b78
+#Source1:      ftp://ftp.freetype.org/freetype/freetype2/ftdocs-2.1.7.tar.bz2
 Source2:       ftp://ftp.freetype.org/freetype/freetype2/ft2demos-%{version}.tar.bz2
-# Source2-md5: 89a5b3fd3177fbc71f9ba7cbc64edfa2
+# Source2-md5: 43ca06d7a926d07db4bbb1885c4a2971
+Patch0:                %{name}-link.patch
 URL:           http://www.freetype.org/
-BuildRequires: SysVinit
 %{?with_x11:BuildRequires:     XFree86-devel}
 BuildRequires: automake
 BuildRequires: zlib-devel
 Obsoletes:     freetype2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                specflags_ia32  "-fomit-frame-pointer"
+%define                specflags_ia32  -fomit-frame-pointer 
+# see <freetype/internal/ftserv.h>, the real horror
+%define                specflags       -fno-strict-aliasing
 
 %description
 The FreeType engine is a free and portable TrueType font rendering
@@ -92,7 +96,7 @@ Summary(pt_BR):       Arquivos de inclus
 Summary(ru):   âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ ÄÌÑ freetype
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ ÄÌÑ freetype
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      zlib-devel
 Obsoletes:     freetype2-devel
 
@@ -130,7 +134,7 @@ Summary(pt_BR):     Bibliotecas est
 Summary(ru):   óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ freetype
 Summary(uk):   óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ freetype
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 Obsoletes:     freetype2-static
 
 %description static
@@ -158,7 +162,7 @@ Summary:    FreeType demo programs
 Summary(ko):   FreeTypeÀ» ½ÃÇèÇغ¼ ¼ö ÀÖ´Â ÇÁ·Î±×·¥ ¸ðÀ½
 Summary(pl):   Programy demonstracyjne FreeType
 Group:         X11/Applications
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description demos
 Demonstration programs for FreeType library.
@@ -168,13 +172,14 @@ Programy demonstracyjne do biblioteki FreeType.
 
 %prep
 %setup -q -a1 -a2
+%patch0 -p1
 
 mv -f freetype-%{version}/docs/reference/* docs/reference
 
 %build
 CFLAGS="%{rpmcflags} %{?with_bytecode:-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER}" \
 %{__make} setup unix \
-       CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
+       CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
 
 %{__make} \
        X11_LIB="/usr/X11R6/%{_lib}"