- updated to 2.3.1 (bugfixes)

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index 9d1c3b8df6e7a747b0e5bfa92544e23e3ce02133..927c1aba2bc9a136cf7e6a8b9f6ba4faaf402e99 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -3,6 +3,9 @@
 %bcond_without bytecode        # without TT bytecode interpreter
 #               (patents pending in USA, Japan etc., but now it includes
 #                also patent-free hinting workaround)
+%bcond_without lcd             # disable filters reducing color fringes when
+#                 subpixel rendering for LCD (only used with a new 2.3.0 API;
+#                 patents pending)
 %bcond_without x11             # don't build examples (X11-based)
 #
 Summary:       TrueType font rasterizer
@@ -13,22 +16,21 @@ Summary(pt_BR):     Biblioteca de renderiza
 Summary(ru):   òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔÏ× TrueType
 Summary(uk):   òÁÓÔÅÒÉÚÁÔÏÒ ÛÒÉÆÔ¦× TrueType
 Name:          freetype
-Version:       2.1.9
+Version:       2.3.1
 Release:       1
 Epoch:         1
 License:       GPL or FTL
 Group:         Libraries
-Source0:       ftp://ftp.freetype.org/freetype/freetype2/%{name}-%{version}.tar.bz2
-# Source0-md5: ec1b903e4be5f073caa72458ea58c29c
-Source1:       ftp://ftp.freetype.org/freetype/freetype2/ftdocs-%{version}.tar.bz2
-# Source1-md5: db77177afe35955f55bcaa2953724b78
-#Source1:      ftp://ftp.freetype.org/freetype/freetype2/ftdocs-2.1.7.tar.bz2
-Source2:       ftp://ftp.freetype.org/freetype/freetype2/ft2demos-%{version}.tar.bz2
-# Source2-md5: 43ca06d7a926d07db4bbb1885c4a2971
-Patch0:                %{name}-link.patch
+Source0:       http://savannah.nongnu.org/download/freetype/%{name}-%{version}.tar.bz2
+# Source0-md5: 11e1186ca5520c5a284fa0a03f652035
+Source1:       http://savannah.nongnu.org/download/freetype/%{name}-doc-%{version}.tar.bz2
+# Source1-md5: 15896b248192283c9891cc157e5793d7
+Source2:       http://savannah.nongnu.org/download/freetype/ft2demos-%{version}.tar.bz2
+# Source2-md5: 80fa3db44d21743ab791df2a068496ca
 URL:           http://www.freetype.org/
-%{?with_x11:BuildRequires:     XFree86-devel}
 BuildRequires: automake
+BuildRequires: python
+%{?with_x11:BuildRequires:     xorg-lib-libX11-devel}
 BuildRequires: zlib-devel
 Obsoletes:     freetype2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -172,27 +174,25 @@ Programy demonstracyjne do biblioteki FreeType.
 
 %prep
 %setup -q -a1 -a2
-%patch0 -p1
-
-mv -f freetype-%{version}/docs/reference/* docs/reference
 
 %build
-CFLAGS="%{rpmcflags} %{?with_bytecode:-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER}" \
+CFLAGS="%{rpmcflags} \
+%{?with_bytecode:-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER} \
+%{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING}" \
 %{__make} setup unix \
-       CC="%{__cc}" \
        CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
 
 %{__make} \
-       CC="%{__cc}" \
-       X11_LIB="/usr/X11R6/%{_lib}"
+       X11_LIB=
 
 %if %{with x11}
 %{__make} -C ft2demos-* \
-       CC="%{__cc}" \
        TOP_DIR="`pwd`" \
-       X11_LIB="/usr/X11R6/%{_lib}"
+       X11_LIB=
 %endif
 
+%{__make} refdoc
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_bindir}
@@ -201,9 +201,7 @@ install -d $RPM_BUILD_ROOT%{_bindir}
        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/testname $RPM_BUILD_ROOT%{_bindir}/fttestname
+install ft2demos-*/bin/.libs/ft* $RPM_BUILD_ROOT%{_bindir}
 %endif
 
 %clean
@@ -214,12 +212,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc docs/{CHANGES,FTL.txt,PATENTS,license.txt,TODO,modules.txt}
+%doc docs/{CHANGES,FTL.TXT,LICENSE.TXT,PATENTS,TODO,formats.txt,raster.txt}
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%doc docs/{DEBUG,TRUETYPE} docs/reference
+%doc docs/DEBUG docs/reference
 %attr(755,root,root) %{_bindir}/freetype-config
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la