X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=freetype.spec;h=6d0511ed4a1f7348aef9a3c81197b5f8cbbfbdec;hb=089ec726e8bc5512ca3d0976ac01da2499a4addc;hp=508e2e4ddf7fcf912bc9560f615158b385e9e417;hpb=48fc52c18f54899cd81f7813632e254e01ca789f;p=packages%2Ffreetype.git

diff --git a/freetype.spec b/freetype.spec
index 508e2e4..6d0511e 100644
--- 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,28 +13,26 @@ Summary(pt_BR):	Biblioteca de renderiza
 Summary(ru):	òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔÏ× TrueType
 Summary(uk):	òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔ¦× TrueType
 Name:		freetype
-Version:	2.1.8
-Release:	3
+Version:	2.1.10
+Release:	1
 Epoch:		1
 License:	GPL or FTL
 Group:		Libraries
-Source0:	ftp://ftp.freetype.org/freetype/freetype2/%{name}-%{version}.tar.bz2
-# Source0-md5:	f717615787a1aadbdb164d1bc23c2308
-# ftdocs-2.1.8 are empty???
-#Source1:	ftp://ftp.freetype.org/freetype/freetype2/ftdocs-%{version}.tar.bz2
-Source1:	ftp://ftp.freetype.org/freetype/freetype2/ftdocs-2.1.7.tar.bz2
-# Source1-md5:	56579e3610482522061cfafbb788a81b
-Source2:	ftp://ftp.freetype.org/freetype/freetype2/ft2demos-%{version}.tar.bz2
-# Source2-md5:	8f74f908637420d54d7cc87168c0a92e
+Source0:	http://savannah.nongnu.org/download/freetype/%{name}-%{version}.tar.bz2
+# Source0-md5:	a4012e7d1f6400df44a16743b11b8423
+Source1:	http://savannah.nongnu.org/download/freetype/%{name}-doc-%{version}.tar.bz2
+# Source1-md5:	10608a55ee9ee12e29ba3d705318e61d
+Source2:	http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2
+# Source2-md5:	4edaff5721fedcf1932e76935f3029b3
 URL:		http://www.freetype.org/
-BuildRequires:	SysVinit
 %{?with_x11:BuildRequires:	XFree86-devel}
 BuildRequires:	automake
 BuildRequires:	zlib-devel
+BuildRequires:	python
 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
 
@@ -174,12 +172,10 @@ Programy demonstracyjne do biblioteki FreeType.
 %prep
 %setup -q -a1 -a2
 
-mv -f freetype-2.1.7/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}"
@@ -190,6 +186,8 @@ CFLAGS="%{rpmcflags} %{?with_bytecode:-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER}"
 	X11_LIB="/usr/X11R6/%{_lib}"
 %endif
 
+%{__make} refdoc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
@@ -211,7 +209,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc docs/{CHANGES,FTL.txt,PATENTS,license.txt,TODO,modules.txt}
+%doc docs/{CHANGES,FTL.TXT,PATENTS,LICENSE.TXT,TODO,modules.txt}
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel