X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffreetype.git;a=blobdiff_plain;f=freetype.spec;h=a922363c6ed97e5d83b557b630a289bc9fa60ae0;hp=30dd0864291ebeb5ee3bd2d431a64c6db9723440;hb=b1a4847864229432a7e5cb3b8a59af4d910d781c;hpb=9cabc9ccb06e38a7f3bdb2f4b2952fc648e2e1f4

diff --git a/freetype.spec b/freetype.spec
index 30dd086..a922363 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,29 +1,40 @@
 #
 # Conditional build:
-# _with_bytecode	- with TT bytecode interpreter
-#			(patents pending in USA, Japan...)
+%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		# don't build examples (X11-based)
 #
 Summary:	TrueType font rasterizer
 Summary(es):	Biblioteca de render 3D de fuentes TrueType
+Summary(ko):	ÀÚÀ¯·Ó°Ô ¾îµðµç ¾µ ¼ö ÀÖ´Â Æ®·çŸÀÔ ±Û²ÃÀ» ´Ù·ç´Â ¿£Áø
 Summary(pl):	Rasteryzer fontów TrueType
 Summary(pt_BR):	Biblioteca de renderização de fontes TrueType
 Summary(ru):	òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔÏ× TrueType
 Summary(uk):	òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔ¦× TrueType
 Name:		freetype
-Version:	2.1.3
+Version:	2.2.1
 Release:	1
+Epoch:		1
 License:	GPL or FTL
 Group:		Libraries
-Source0:	http://telia.dl.sourceforge.net/sourceforge/freetype/%{name}-%{version}.tar.bz2
-Source1:	http://telia.dl.sourceforge.net/sourceforge/freetype/ftdocs-%{version}.tar.bz2
-Source2:	http://telia.dl.sourceforge.net/sourceforge/freetype/ft2demos-%{version}.tar.bz2
+Source0:	http://savannah.nongnu.org/download/freetype/%{name}-%{version}.tar.bz2
+# Source0-md5:	5b2f827082c544392a7701f7423f0781
+Source1:	http://savannah.nongnu.org/download/freetype/%{name}-doc-%{version}.tar.bz2
+# Source1-md5:	27bcd2540702afe6753c9fd74670f617
+Source2:	http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2
+# Source2-md5:	64f5fa4425cd8241b130c0be35ba6760
 URL:		http://www.freetype.org/
-BuildRequires:	SysVinit
-BuildRequires:	XFree86-devel
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires:	automake
+BuildRequires:	python
+%{?with_x11:BuildRequires:	xorg-lib-libX11-devel}
+BuildRequires:	zlib-devel
 Obsoletes:	freetype2
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_xbindir	/usr/X11R6/bin
+%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
@@ -78,12 +89,14 @@ inclu
 %package devel
 Summary:	Header files and development documentation
 Summary(es):	Archivos de inclusión e bibliotecas estáticas para desarrollo con FreeType
+Summary(ko):	FreeTypeÀ» ¾µ ¶§ ÇÊ¿äÇÑ Á¤Àû ¶óÀ̺귯¸®¿Í ¸Ó¸®¸» ÆÄÀÏ
 Summary(pl):	Pliki nag³ówkowe biblioteki freetype i dokumentacja
 Summary(pt_BR):	Arquivos de inclusão e bibliotecas estáticas para desenvolvimento com FreeType
 Summary(ru):	âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ ÄÌÑ freetype
 Summary(uk):	â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ ÄÌÑ freetype
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	zlib-devel
 Obsoletes:	freetype2-devel
 
 %description devel
@@ -120,7 +133,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
@@ -145,9 +158,10 @@ Bibliotecas est
 
 %package demos
 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.
@@ -156,28 +170,34 @@ Demonstration programs for FreeType library.
 Programy demonstracyjne do biblioteki FreeType.
 
 %prep
-%setup -q -b1 -a2
+%setup -q -a1 -a2
 
 %build
-CFLAGS="%{rpmcflags} %{?_with_bytecode:-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER}" \
-%{__make} setup CFG="--prefix=%{_prefix}"
+CFLAGS="%{rpmcflags} %{?with_bytecode:-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER}" \
+%{__make} setup unix \
+	CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
+
+%{__make} \
+	X11_LIB=
 
-%{__make}
+%if %{with x11}
+%{__make} -C ft2demos-* \
+	TOP_DIR="`pwd`" \
+	X11_LIB=
+%endif
 
-%{__make} TOP_DIR="`pwd`" -C ft2demos-*
+%{__make} refdoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_bindir}
 
 %{__make} install \
-	DESTDIR="$RPM_BUILD_ROOT" \
-	datadir=%{_datadir}
+	DESTDIR=$RPM_BUILD_ROOT
 
-# demos
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_xbindir}}
-install ft2demos-*/bin/.libs/ft{multi,timer,view} $RPM_BUILD_ROOT%{_xbindir}
-install ft2demos-*/bin/.libs/ft{dump,lint,memchk} $RPM_BUILD_ROOT%{_bindir}
-install ft2demos-*/bin/.libs/testnames $RPM_BUILD_ROOT%{_bindir}/fttestnames
+%if %{with x11}
+install ft2demos-*/bin/.libs/ft* $RPM_BUILD_ROOT%{_bindir}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -187,24 +207,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc docs/{BUGS,CHANGES,FTL.txt,PATENTS,license.txt,TODO,modules.txt}
-%attr(755,root,root) %{_libdir}/lib*so.*.*
+%doc docs/{CHANGES,FTL.TXT,LICENSE.TXT,PATENTS,TODO,formats.txt,raster.txt}
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc docs/*.html docs/{design,freetype2,glyphs,reference,tutorial}
+%doc docs/DEBUG docs/reference
 %attr(755,root,root) %{_bindir}/freetype-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_includedir}/freetype2
 %{_includedir}/*.h
 %{_aclocaldir}/*.m4
+%{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
+%if %{with x11}
 %files demos
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ft*
-%attr(755,root,root) %{_xbindir}/ft*
+%endif