X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=freetype.spec;h=404c9cd9f520c59134f501531f721f2aba387e0e;hb=86a13cde4f4ee44af8bb7d7efc780c28b1491114;hp=c8e5ddeaa4378d6ed1a5ec909405bf07e37a6e6c;hpb=49fdc5ecdb1ab36c0109218899659cdc58a8b0cc;p=packages%2Ffreetype.git

diff --git a/freetype.spec b/freetype.spec
index c8e5dde..404c9cd 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,10 +1,9 @@
 #
 # 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	apidocs         # disable api docs
-#
+
 Summary:	TrueType font rasterizer
 Summary(es.UTF-8):	Biblioteca de render 3D de fuentes TrueType
 Summary(ko.UTF-8):	자유롭게 어디든 쓸 수 있는 트루타입 글꼴을 다루는 엔진
@@ -13,17 +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.3.12
+Version:	2.4.7
 Release:	1
 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:	e974a82e5939be8e05ee65f07275d7c5
-Source1:	http://dl.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5:	2788beb4e1ee01bad8ed9978c0630e86
-Source2:	http://dl.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5:	ce2811161e779de4eff39bd9d5d916ba
+Source0:	http://downloads.sourceforge.net/freetype/%{name}-%{version}.tar.bz2
+# Source0-md5:	dbadce8f0c5e70a0b7c51eadf2dd9394
+Source1:	http://downloads.sourceforge.net/freetype/%{name}-doc-%{version}.tar.bz2
+# Source1-md5:	09bfc874435c300252d42b8961564c05
+Source2:	http://downloads.sourceforge.net/freetype/ft2demos-%{version}.tar.bz2
+# Source2-md5:	d0118543dfe789bb9fb3b43593b62c05
+Patch0:		freetype-2.2.1-enable-valid.patch
 URL:		http://www.freetype.org/
 BuildRequires:	automake
 BuildRequires:	python
@@ -188,10 +188,10 @@ Programy demonstracyjne do biblioteki FreeType.
 
 %prep
 %setup -q -a1 -a2
+%patch0 -p1
 
 %build
-CFLAGS="%{rpmcflags} \
-%{?with_bytecode:-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER} \
+CFLAGS="%{rpmcflags} %{rpmcppflags} \
 %{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING}" \
 %{__make} setup unix \
 	CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
@@ -215,7 +215,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
@@ -226,7 +226,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