X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=freetype.spec;h=047b9febfbb9b1209b9e6ec72a852d652c9fffc8;hb=65f14731479ff4fcaf8a8e143cbed000c0e4d997;hp=c45e17123be7adc0823da6ccede8d8efb92d58b8;hpb=a5da9fa17cf2f3a2b3fedcc1f7c48d709d33aa1c;p=packages%2Ffreetype.git

diff --git a/freetype.spec b/freetype.spec
index c45e171..047b9fe 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,22 +1,28 @@
-Summary:	Truetype font rasterizer
-Summary(pl):	Rasteryzer fontów Truetype
+#
+# Conditional build:
+# _without_bytecode	- without TT bytecode interpreter
+#			(patents pending in USA, Japan...)
+#
+Summary:	TrueType font rasterizer
+Summary(pl):	Rasteryzer fontów TrueType
 Name:		freetype
-Version:	2.0.4
+Version:	2.0.9
 Release:	1
 License:	GPL or FTL
 Group:		Libraries
-Group(de):	Libraries
-Group(es):	Bibliotecas
-Group(fr):	Librairies
-Group(pl):	Biblioteki
-Source0:	ftp://freetype.sourceforge.net/pub/freetype/%{name}2/%{name}-%{version}.tar.bz2
-Source1:	ftp://freetype.sourceforge.net/pub/freetype/%{name}2/ftdocs-%{version}.tar.bz2
+Source0:	ftp://ftp.freetype.org/freetype/freetype2/%{name}-%{version}.tar.bz2
+Source1:	ftp://ftp.freetype.org/freetype/freetype2/ftdocs-%{version}.tar.bz2
+Source2:	ftp://ftp.freetype.org/freetype/freetype2/ft2demos-%{version}.tar.bz2
 Patch0:		%{name}2-DESTDIR.patch
-Patch1:		%{name}2-gsf-segv.patch
+Patch1:		%{name}2-bytecode.patch
 URL:		http://www.freetype.org/
+BuildRequires:	SysVinit
+BuildRequires:	XFree86-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	freetype2
 
+%define		_xbindir	/usr/X11R6/bin
+
 %description
 The FreeType engine is a free and portable TrueType font rendering
 engine. It has been developed to provide TrueType support to a great
@@ -31,53 +37,67 @@ a "TrueType driver" for a higher-level library, though rendering text
 with it is extremely easy, as demo-ed by the test programs.
 
 %description -l pl
-FreeType jest bibliotek± s³u¿±c± do rasteryzacji fontów TrueType. Kody
-¼ród³owe napisane s± w ANSI C oraz PASCAL'u.
+FreeType jest bibliotek± s³u¿±c± do rasteryzacji fontów TrueType. Jest
+to jedynie biblioteka, a nie serwer fontów, chocia¿ zosta³a ona
+zaprojektowana do u¿ywania tak¿e w takich serwerach. Nie jest to te¿
+kompletna biblioteka do rasteryzacji tekstu. Jej celem jest tylko
+odczytywanie i zarz±dzanie plikami z fontami oraz wczytywanie i
+wykonywanie hintingu i rasteryzacji poszczególnych glifów. Mo¿e byæ
+tak¿e uwa¿ana za "sterownik TrueType" dla bibliotek wy¿szego poziomu,
+jednak u¿ycie samej biblioteki FreeType do rasteryzacji jest bardzo
+proste, co mo¿na zobaczyæ w programach demonstracyjnych.
 
 %package devel
 Summary:	Header files and development documentation
 Summary(pl):	Pliki nag³ówkowe biblioteki freetype i dokumentacja
 Group:		Development/Libraries
-Group(de):	Entwicklung/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
 Requires:	%{name} = %{version}
 Obsoletes:	freetype2-devel
-Obsoletes:	freetype2-static
 
 %description devel
-This package includes the header files documentations and libraries
-necessary to develop applications that use freetype.
+This package includes the header files and documentation necessary
+to develop applications that use FreeType.
 
-%description -l pl devel 
-Pakiet ten zawiera pliki nag³ówkowe oraz biblioteki niezbêdne przy
-kompilowaniu programów wykorzystuj±cych bibliotekê freetype.
+%description devel -l pl
+Pakiet ten zawiera pliki nag³ówkowe oraz dokumentacjê potrzebne przy
+tworzeniu programów wykorzystuj±cych bibliotekê FreeType.
 
 %package static
-Summary:	Freetype static libraries
-Summary(pl):	Biblioteki statyczne freetype
+Summary:	FreeType static libraries
+Summary(pl):	Biblioteki statyczne FreeType
 Group:		Development/Libraries
-Group(de):	Entwicklung/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
 Requires:	%{name}-devel = %{version}
 Obsoletes:	freetype2-static
 
 %description static
-Static freetype libraries.
+Static FreeType libraries.
 
-%description -l pl static 
-Biblioteki statyczne freetype.
+%description static -l pl
+Biblioteki statyczne FreeType.
+
+%package demos
+Summary:	FreeType demo programs
+Summary(pl):	Programy demonstracyjne FreeType
+Group:		X11/Applications
+Requires:	%{name} = %{version}
+
+%description demos
+Demonstration programs for FreeType library.
+
+%description demos -l pl
+Programy demonstracyjne do biblioteki FreeType.
 
 %prep
-%setup -q -b1
+%setup -q -b1 -a2
 %patch0 -p1
-%patch1 -p1
+%{!?_without_bytecode:%patch1 -p1}
 
 %build
 CFLAGS="%{rpmcflags}" %{__make} setup CFG="--prefix=%{_prefix}"
 
-%{__make} 
+%{__make}
+
+%{__make} TOP="`pwd`" -C ft2demos-*
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -85,14 +105,20 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR="$RPM_BUILD_ROOT"
 
-gzip -9nf docs/{CHANGES,FTL.txt,PATENTS,license.txt,todo,cache.txt}
+# 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
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+gzip -9nf docs/{BUGS,CHANGES,FTL.txt,PATENTS,license.txt,TODO,modules.txt}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc docs/*.gz
@@ -101,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %doc docs/*.html docs/{design,freetype2,glyphs,reference,tutorial}
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/freetype-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.la
 %{_includedir}/freetype2
@@ -110,3 +136,8 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
+
+%files demos
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ft*
+%attr(755,root,root) %{_xbindir}/ft*