- removed unused patches

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index f7d3f4c2a00f27c56b884eaa147a099c0bff7563..2881388b967c476e3014b8a92defbec9baab70e0 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,8 +1,11 @@
 #
+# todo: update patches
+#
 # Conditional build:
-# _without_bytecode    - without TT bytecode interpreter
+# _with_bytecode       - without TT bytecode interpreter
 #                      (patents pending in USA, Japan...)
 #
+
 Summary:       TrueType font rasterizer
 Summary(es):   Biblioteca de render 3D de fuentes TrueType
 Summary(pl):   Rasteryzer fontów TrueType
@@ -10,15 +13,14 @@ Summary(pt_BR):     Biblioteca de renderiza
 Summary(ru):   òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔÏ× TrueType
 Summary(uk):   òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔ¦× TrueType
 Name:          freetype
-Version:       2.1.1
+Version:       2.1.3
 Release:       1
 License:       GPL or FTL
 Group:         Libraries
 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-bytecode.patch
+Patch0:                %{name}2-bytecode.patch
 URL:           http://www.freetype.org/
 BuildRequires: SysVinit
 BuildRequires: XFree86-devel
@@ -79,9 +81,9 @@ inclu
 
 %package devel
 Summary:       Header files and development documentation
-Summary(es):   Archivos de inclusión e bibliotecas estáticas para desarrollo con FreeType.
+Summary(es):   Archivos de inclusión e bibliotecas estáticas para desarrollo con 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(pt_BR):        Arquivos de inclusão e bibliotecas estáticas para desenvolvimento com FreeType
 Summary(ru):   âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ ÄÌÑ freetype
 Summary(uk):   â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ ÄÌÑ freetype
 Group:         Development/Libraries
@@ -137,11 +139,11 @@ Biblioteki statyczne FreeType.
 %description static -l pt_BR
 Bibliotecas estáticas para desenvolvimento com freetype.
 
-%description devel-static -l ru
+%description static -l ru
 üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÎÁÐÉÓÁÎÉÑ
 ÐÒÏÇÒÁÍÍ, ÉÓÐÏÌØÚÕÀÝÉÈ freetype.
 
-%description devel-static -l uk
+%description static -l uk
 ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÎÁÐÉÓÁÎÎÑ
 ÐÒÏÇÒÁÍ, ÝÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ freetype.
 
@@ -159,21 +161,21 @@ Programy demonstracyjne do biblioteki FreeType.
 
 %prep
 %setup -q -b1 -a2
-%patch0 -p1
-%{!?_without_bytecode:%patch1 -p1}
+%{?_with_bytecode:%patch0 -p1}
 
 %build
 CFLAGS="%{rpmcflags}" %{__make} setup CFG="--prefix=%{_prefix}"
 
 %{__make}
 
-%{__make} TOP="`pwd`" -C ft2demos-*
+%{__make} TOP_DIR="`pwd`" -C ft2demos-*
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-       DESTDIR="$RPM_BUILD_ROOT"
+       DESTDIR="$RPM_BUILD_ROOT" \
+       datadir=%{_datadir}
 
 # demos
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_xbindir}}
@@ -181,8 +183,6 @@ 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
 
-gzip -9nf docs/{BUGS,CHANGES,FTL.txt,PATENTS,license.txt,TODO,modules.txt}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -191,7 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc docs/*.gz
+%doc docs/{BUGS,CHANGES,FTL.txt,PATENTS,license.txt,TODO,modules.txt}
 %attr(755,root,root) %{_libdir}/lib*so.*.*
 
 %files devel
@@ -199,9 +199,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/*.html docs/{design,freetype2,glyphs,reference,tutorial}
 %attr(755,root,root) %{_bindir}/freetype-config
 %attr(755,root,root) %{_libdir}/lib*.so
-%attr(755,root,root) %{_libdir}/lib*.la
+%{_libdir}/lib*.la
 %{_includedir}/freetype2
 %{_includedir}/*.h
+%{_aclocaldir}/*.m4
 
 %files static
 %defattr(644,root,root,755)