- rel 2; enable some validations (from fc)

Changed files:
    freetype-2.2.1-enable-valid.patch -> 1.1
    freetype.spec -> 1.161

diff --git a/freetype-2.2.1-enable-valid.patch b/freetype-2.2.1-enable-valid.patch
new file mode 100644 (file)
index 0000000..c78b6b7
--- /dev/null
+++ b/freetype-2.2.1-enable-valid.patch
@@ -0,0 +1,20 @@
+--- freetype-2.2.1/modules.cfg.orig    2006-07-07 21:01:09.000000000 -0400
++++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400
+@@ -110,7 +110,7 @@
+ AUX_MODULES += cache
+ 
+ # TrueType GX/AAT table validation.  Needs ftgxval.c below.
+-# AUX_MODULES += gxvalid
++AUX_MODULES += gxvalid
+ 
+ # Support for streams compressed with gzip (files with suffix .gz).
+ #
+@@ -124,7 +124,7 @@
+ 
+ # OpenType table validation.  Needs ftotval.c below.
+ #
+-# AUX_MODULES += otvalid
++AUX_MODULES += otvalid
+ 
+ # Auxiliary PostScript driver component to share common code.
+ #

diff --git a/freetype.spec b/freetype.spec
index d16e7e23ef4f6544b3d6599e895c465a91f69ae3..bd7d06336bc128c1415143bb63cdf54d34685952 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -13,7 +13,7 @@ Summary(ru.UTF-8):    Растеризатор шрифтов TrueType
 Summary(uk.UTF-8):     Растеризатор шрифтів TrueType
 Name:          freetype
 Version:       2.4.6
-Release:       1
+Release:       2
 Epoch:         1
 License:       GPL or FTL
 Group:         Libraries
@@ -23,6 +23,7 @@ Source1:      http://downloads.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz
 # Source1-md5: e9ba39c2ca46e887e995d70f03284188
 Source2:       http://downloads.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
 # Source2-md5: 7d777ed105ec393170e007203fa1bbbe
+Patch0:                freetype-2.2.1-enable-valid.patch
 URL:           http://www.freetype.org/
 BuildRequires: automake
 BuildRequires: python
@@ -187,9 +188,10 @@ Programy demonstracyjne do biblioteki FreeType.
 
 %prep
 %setup -q -a1 -a2
+%patch0 -p1
 
 %build
-CFLAGS="%{rpmcflags} \
+CFLAGS="%{rpmcflags} %{rpmcppflags} \
 %{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING}" \
 %{__make} setup unix \
        CFG="--prefix=%{_prefix} --libdir=%{_libdir}"