X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffreetype.git;a=blobdiff_plain;f=freetype.spec;h=c773322b19f55b113257c036c37f85323096e7a5;hp=63f0e889fa2c07437a8017eac1e870e4d36716d8;hb=2d8f7f9e206c522c09dd56b3db09e9e14be90775;hpb=d4ee095a907da29d7ebd835e8b4f396cc5d64c7e

diff --git a/freetype.spec b/freetype.spec
index 63f0e88..c773322 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,7 +1,9 @@
 #
 # 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
 #
 Summary:	TrueType font rasterizer
 Summary(es):	Biblioteca de render 3D de fuentes TrueType
@@ -11,23 +13,25 @@ Summary(pt_BR):	Biblioteca de renderiza
 Summary(ru):	òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔÏ× TrueType
 Summary(uk):	òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔ¦× TrueType
 Name:		freetype
-Version:	2.1.4
-Release:	2
+Version:	2.1.8
+Release:	1
 License:	GPL or FTL
 Group:		Libraries
-Source0:	http://dl.sourceforge.net/sourceforge/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: 1fc0b188f1fe1216776e5855d2da141f
-Source1:	http://dl.sourceforge.net/sourceforge/freetype/ftdocs-%{version}.tar.bz2
-# Source1-md5: 367064e81998a302f3844f1dcdb8d77f
-Source2:	http://dl.sourceforge.net/sourceforge/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: 92cb4e645fe1cfb8345b64cedb9d332e
-Patch0:	ftlru.c.diff
+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
 URL:		http://www.freetype.org/
 BuildRequires:	SysVinit
-BuildRequires:	XFree86-devel
+%{?with_x11:BuildRequires:	XFree86-devel}
+BuildRequires:	automake
 BuildRequires:	zlib-devel
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	freetype2
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_ia32	"-fomit-frame-pointer"
 
@@ -90,7 +94,7 @@ Summary(pt_BR):	Arquivos de inclus
 Summary(ru):	âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ ÄÌÑ freetype
 Summary(uk):	â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ ÄÌÑ freetype
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Requires:	zlib-devel
 Obsoletes:	freetype2-devel
 
@@ -128,7 +132,7 @@ Summary(pt_BR):	Bibliotecas est
 Summary(ru):	óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ freetype
 Summary(uk):	óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ freetype
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 Obsoletes:	freetype2-static
 
 %description static
@@ -156,7 +160,7 @@ Summary:	FreeType demo programs
 Summary(ko):	FreeTypeÀ» ½ÃÇèÇغ¼ ¼ö ÀÖ´Â ÇÁ·Î±×·¥ ¸ðÀ½
 Summary(pl):	Programy demonstracyjne FreeType
 Group:		X11/Applications
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description demos
 Demonstration programs for FreeType library.
@@ -166,30 +170,35 @@ Programy demonstracyjne do biblioteki FreeType.
 
 %prep
 %setup -q -a1 -a2
-patch src/cache/ftlru.c < %{PATCH0}
 
-mv -f freetype-%{version}/docs/* docs
+mv -f freetype-2.1.7/docs/reference/* docs/reference
 
 %build
-CFLAGS="%{rpmcflags} %{?_with_bytecode:-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER}" \
+CFLAGS="%{rpmcflags} %{?with_bytecode:-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER}" \
 %{__make} setup unix \
-	CFG="--prefix=%{_prefix}"
+       CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
 
-%{__make}
+%{__make} \
+	X11_LIB="/usr/X11R6/%{_lib}"
 
-%{__make} TOP_DIR="`pwd`" -C ft2demos-*
+%if %{with x11}
+%{__make} -C ft2demos-* \
+	TOP_DIR="`pwd`" \
+	X11_LIB="/usr/X11R6/%{_lib}"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	datadir=%{_datadir}
+	DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with x11}
 install ft2demos-*/bin/.libs/ft{multi,timer,view} $RPM_BUILD_ROOT%{_bindir}
 install ft2demos-*/bin/.libs/ft{dump,lint,memchk} $RPM_BUILD_ROOT%{_bindir}
-install ft2demos-*/bin/.libs/testnames $RPM_BUILD_ROOT%{_bindir}/fttestnames
+install ft2demos-*/bin/.libs/testname $RPM_BUILD_ROOT%{_bindir}/fttestname
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -200,22 +209,25 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc docs/{CHANGES,FTL.txt,PATENTS,license.txt,TODO,modules.txt}
-%attr(755,root,root) %{_libdir}/lib*so.*.*
+%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,TRUETYPE} 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*
+%endif