- updated to 2.0.5

- bytecode patch to turn on TT bytecode iterpreter
  (default on, bcond to turn off - patents pending in USA and Japan)

Changed files:
    freetype.spec -> 1.50
    freetype2-bytecode.patch -> 1.1

diff --git a/freetype.spec b/freetype.spec
index c45e17123be7adc0823da6ccede8d8efb92d58b8..063de1ac005520ea737e8a1fdb67f3a8e5889f15 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -1,7 +1,12 @@
+#
+# 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.5
 Release:       1
 License:       GPL or FTL
 Group:         Libraries
@@ -9,10 +14,14 @@ 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
+Group(pt_BR):  Bibliotecas
+Group(ru):     âÉÂÌÉÏÔÅËÉ
+Group(uk):     â¦Â̦ÏÔÅËÉ
+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/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     freetype2
@@ -39,8 +48,12 @@ Summary:     Header files and development documentation
 Summary(pl):   Pliki nag³ówkowe biblioteki freetype i dokumentacja
 Group:         Development/Libraries
 Group(de):     Entwicklung/Libraries
+Group(es):     Desarrollo/Bibliotecas
 Group(fr):     Development/Librairies
 Group(pl):     Programowanie/Biblioteki
+Group(pt_BR):  Desenvolvimento/Bibliotecas
+Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name} = %{version}
 Obsoletes:     freetype2-devel
 Obsoletes:     freetype2-static
@@ -58,8 +71,12 @@ Summary:     Freetype static libraries
 Summary(pl):   Biblioteki statyczne freetype
 Group:         Development/Libraries
 Group(de):     Entwicklung/Libraries
+Group(es):     Desarrollo/Bibliotecas
 Group(fr):     Development/Librairies
 Group(pl):     Programowanie/Biblioteki
+Group(pt_BR):  Desenvolvimento/Bibliotecas
+Group(ru):     òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
+Group(uk):     òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-devel = %{version}
 Obsoletes:     freetype2-static
 
@@ -73,6 +90,7 @@ Biblioteki statyczne freetype.
 %setup -q -b1
 %patch0 -p1
 %patch1 -p1
+%{!?_without_bytecode:%patch2 -p1}
 
 %build
 CFLAGS="%{rpmcflags}" %{__make} setup CFG="--prefix=%{_prefix}"
@@ -85,14 +103,14 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR="$RPM_BUILD_ROOT"
 
-gzip -9nf docs/{CHANGES,FTL.txt,PATENTS,license.txt,todo,cache.txt}
-
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+gzip -9nf docs/{BUGS,CHANGES,FTL.txt,PATENTS,license.txt,todo,cache.txt}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post   -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 %doc docs/*.gz

diff --git a/freetype2-bytecode.patch b/freetype2-bytecode.patch
new file mode 100644 (file)
index 0000000..a54080c
--- /dev/null
+++ b/freetype2-bytecode.patch
@@ -0,0 +1,11 @@
+--- freetype-2.0.5/include/freetype/config/ftoption.h.orig     Tue Aug 21 10:50:45 2001
++++ freetype-2.0.5/include/freetype/config/ftoption.h  Tue Oct 23 23:51:12 2001
+@@ -338,7 +338,7 @@
+   /* By undefining this, you will only compile the code necessary to load  */
+   /* TrueType glyphs without hinting.                                      */
+   /*                                                                       */
+-#undef  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
++#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+ 
+ 
+   /*************************************************************************/