X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=freetype.spec;h=f7071ce0f30da5c5253dff26ae339b98ba492cb7;hb=6069089f54dece18a23a1fd56b69ef9189550c58;hp=5e9f66eba1d5b305047fe5a9248641f577a4dd82;hpb=a94766182e23e3d156bf18860563625802c0bb9e;p=packages%2Ffreetype.git

diff --git a/freetype.spec b/freetype.spec
index 5e9f66e..f7071ce 100644
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,19 +1,24 @@
+#
+# 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:	1.3.1
-Release:	1
-License:	BSD like
+Version:	2.0.6
+Release:	2
+License:	GPL or FTL
 Group:		Libraries
-Group(fr):	Librairies
-Group(pl):	Biblioteki
-Source0:	ftp://ftp.physiol.med.tu-muenchen.de/pub/freetype/%{name}-%{version}.tar.gz
-Patch0:		freetype-DESTDIR.patch
-Patch1:		freetype-autoconf.patch
-URL:		http://www.physiol.med.tu-muenchen.de/~robert/freetype.html
-BuildRequires:	gettext-devel
-BuildRequires:	XFree86-devel
+Source0:	ftp://ftp.freetype.org/freetype/freetype2/%{name}-%{version}.tar.bz2
+Source1:	ftp://ftp.freetype.org/freetype/freetype2/ftdocs-%{version}.tar.bz2
+Patch0:		%{name}2-DESTDIR.patch
+Patch1:		%{name}2-gsf-segv.patch
+Patch2:		%{name}2-bytecode.patch
+URL:		http://www.freetype.org/
+BuildRequires:	SysVinit
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:	freetype2
 
 %description
 The FreeType engine is a free and portable TrueType font rendering
@@ -36,15 +41,15 @@ FreeType jest bibliotek
 Summary:	Header files and development documentation
 Summary(pl):	Pliki nag³ówkowe biblioteki freetype i dokumentacja
 Group:		Development/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.
 
-%description -l pl devel 
+%description devel -l pl
 Pakiet ten zawiera pliki nag³ówkowe oraz biblioteki niezbêdne przy
 kompilowaniu programów wykorzystuj±cych bibliotekê freetype.
 
@@ -52,87 +57,54 @@ kompilowaniu program
 Summary:	Freetype static libraries
 Summary(pl):	Biblioteki statyczne freetype
 Group:		Development/Libraries
-Group(fr):	Development/Librairies
-Group(pl):	Programowanie/Biblioteki
 Requires:	%{name}-devel = %{version}
+Obsoletes:	freetype2-static
 
 %description static
 Static freetype libraries.
 
-%description -l pl static 
+%description static -l pl
 Biblioteki statyczne freetype.
 
-%package progs
-Summary:	Freetype library utilities
-Summary(pl):	Programy u¿ytkowe freetype
-Group:		Utilities
-Group(pl):	Programowanie/Biblioteki
-Requires:	%{name} = %{version}
-Obsoletes:	freetype-utils
-
-%description progs
-Freetype library utilites:
-- ftimer - a simple performance timer for the engine,
-- fzoom - very simple glyph viewer,
-- ftlint - program will hint each glyph of a font file, at a given
-  point size,
-- ftwiew - display all glyphs in a given font, applying hinting to
-  each one,
-- fdump - a simple TrueType font or collection dumper,
-- ftstring - a simple program to show off string text generation.
-- ftstrpn - convert a rendered text string into the PGM or PBM format,
-- fterror - small test program. Tests the gettext() functionality for
-  internationalized messages.
-
-%description -l pl progs
-Przyk³adowe aplikacje wykorzystuj±ce freetype.
-
 %prep
-%setup  -q
+%setup -q -b1
 %patch0 -p1
 %patch1 -p1
+%{!?_without_bytecode:%patch2 -p1}
 
 %build
-gettextize --copy --force
-aclocal
-autoconf
-LDFLAGS="-s"; export LDFLAGS
-%configure \
-        --enable-static \
-        --with-gnu-ld
+CFLAGS="%{rpmcflags}" %{__make} setup CFG="--prefix=%{_prefix}"
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-strip $RPM_BUILD_ROOT%{_libdir}/lib*so.*.*
+%{__make} install \
+	DESTDIR="$RPM_BUILD_ROOT"
 
-gzip -9nf howto/unix.txt README announce docs/{*.txt,FAQ,TODO,credits}
+gzip -9nf docs/{BUGS,CHANGES,FTL.txt,PATENTS,license.txt,TODO,modules.txt}
 
-%find_lang %{name}
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post   -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %{name}.lang
+%files
 %defattr(644,root,root,755)
+%doc docs/*.gz
 %attr(755,root,root) %{_libdir}/lib*so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc howto/unix* docs/*txt* *.gz
+%doc docs/*.html docs/{design,freetype2,glyphs,reference,tutorial}
+%attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.la
-%{_includedir}/*
+%{_includedir}/freetype2
+%{_includedir}/*.h
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
-
-%files progs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*