- rel 2; enable some validations (from fc)

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index 858349e1a8ecf95553b4e675556f6c48560913e7..bd7d06336bc128c1415143bb63cdf54d34685952 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -12,18 +12,18 @@ 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.4.3
-Release:       3
+Version:       2.4.6
+Release:       2
 Epoch:         1
 License:       GPL or FTL
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: 75ac7082bde7b3805dc5d6bc806fa045
+# Source0-md5: 5e6510613f612809d2d7862592b92ab7
 Source1:       http://downloads.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: 79a0fa0444eb7f2f46e75cae74c0772d
+# Source1-md5: e9ba39c2ca46e887e995d70f03284188
 Source2:       http://downloads.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: ffc0152660b96ba2126926860e6d7bcc
-Patch0:                %{name}-CVE-2010-3855.patch
+# Source2-md5: 7d777ed105ec393170e007203fa1bbbe
+Patch0:                freetype-2.2.1-enable-valid.patch
 URL:           http://www.freetype.org/
 BuildRequires: automake
 BuildRequires: python
@@ -191,7 +191,7 @@ Programy demonstracyjne do biblioteki FreeType.
 %patch0 -p1
 
 %build
-CFLAGS="%{rpmcflags} \
+CFLAGS="%{rpmcflags} %{rpmcppflags} \
 %{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING}" \
 %{__make} setup unix \
        CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
@@ -236,7 +236,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/freetype-config
 %attr(755,root,root) %{_libdir}/libfreetype.so
 %{_libdir}/libfreetype.la
-/usr/include/freetype2
+%{_includedir}/freetype2
 %{_includedir}/ft2build.h
 %{_aclocaldir}/freetype2.m4
 %{_pkgconfigdir}/freetype2.pc