missing patch update

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index 6123048699ded1bff7e9fd4b9989f93ecd34d61d..f71caa67204235298c3ed3e131703e233a4d3c4e 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -2,7 +2,9 @@
 # Conditional build:
 %bcond_without lcd             # without LCD subpixel color filtering (Microsoft patents in USA)
 %bcond_without x11             # don't build examples (X11-based)
+%bcond_without harfbuzz        # harfbuzz based autohinting
 %bcond_without apidocs         # disable api docs
+%bcond_with    regen_refdoc    # regenerate reference documentation
 
 Summary:       TrueType font rasterizer
 Summary(es.UTF-8):     Biblioteca de render 3D de fuentes TrueType
@@ -12,25 +14,30 @@ Summary(pt_BR.UTF-8):       Biblioteca de renderização de fontes TrueType
 Summary(ru.UTF-8):     Растеризатор шрифтов TrueType
 Summary(uk.UTF-8):     Растеризатор шрифтів TrueType
 Name:          freetype
-Version:       2.5.2
+Version:       2.10.0
 Release:       1
 Epoch:         1
 License:       GPL v2 or FTL
 Group:         Libraries
 Source0:       http://download.savannah.gnu.org/releases/freetype/%{name}-%{version}.tar.bz2
-# Source0-md5: 10e8f4d6a019b124088d18bc26123a25
+# Source0-md5: a717e6925b61b9dda946322ecd278a42
 Source1:       http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: cb858209b8d84860345f3f62fcae2af2
+# Source1-md5: a41f85729ce4936e297d869957635e20
 Source2:       http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: 399d98441c6c67b5bf29c7733db27438
+# Source2-md5: 3b0202eafd9282cb5d70d0a57de489d4
 Patch0:                %{name}-2.2.1-enable-valid.patch
-Patch1:                %{name}-git.patch
+Patch1:                ft2demos-includes.patch
 URL:           http://www.freetype.org/
 BuildRequires: automake
 BuildRequires: bzip2-devel
+%{?with_harfbuzz:BuildRequires:        harfbuzz-devel >= 0.9.21}
 BuildRequires: libpng-devel
-BuildRequires: python
-BuildRequires: python-modules
+BuildRequires: pkgconfig >= 1:0.24
+%if %{with regen_refdoc}
+BuildRequires: python3
+BuildRequires: python3-docwriter
+BuildRequires: python3-modules
+%endif
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: sed >= 4.0
 %if "%{pld_release}" == "ac"
@@ -107,6 +114,7 @@ Summary(uk.UTF-8):  Бібліотеки програміста для freetype
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      bzip2-devel
+%{?with_harfbuzz:Requires:     harfbuzz-devel >= 0.9.21}
 Requires:      libpng-devel
 Requires:      zlib-devel
 Obsoletes:     freetype2-devel
@@ -141,6 +149,9 @@ rodar aplicações existentes, você não precisa deste pacote.
 Summary:       FreeType API documetation
 Summary(pl.UTF-8):     Dokumentacja API FreeType
 Group:         Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description apidocs
 FreeType API documetation.
@@ -195,29 +206,37 @@ Programy demonstracyjne do biblioteki FreeType.
 %prep
 %setup -q -a1 -a2
 %patch0 -p1
-%patch1 -p1
+cd ft2demos-%{version}
+%patch1 -p2
+cd ..
 
 # avoid propagating -L%{_libdir} through *.la
 %{__sed} -i -e 's,libpng-config --ldflags,libpng-config --libs,' builds/unix/configure
 
 %build
+CC="%{__cc}" \
 CFLAGS="%{rpmcflags} %{rpmcppflags} \
 %{?with_lcd:-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING} \
--DTT_CONFIG_OPTION_SUBPIXEL_HINTING \
+-DTT_CONFIG_OPTION_SUBPIXEL_HINTING=2 \
+%{?with_harfbuzz:-DFT_CONFIG_OPTION_USE_HARFBUZZ} \
 " \
 %{__make} setup unix \
-       CFG="--prefix=%{_prefix} --libdir=%{_libdir}"
+       CFG="--prefix=%{_prefix} --libdir=%{_libdir} --enable-freetype-config"
 
+CC="%{__cc}" \
 %{__make} \
        X11_LIB=%{?_x_libraries}
 
 %if %{with x11}
+CC="%{__cc}" \
 %{__make} -C ft2demos-* \
        TOP_DIR=$(pwd) \
        X11_LIB=%{?_x_libraries}
 %endif
 
+%if %{with regen_refdoc}
 %{__make} refdoc
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -226,8 +245,6 @@ install -d $RPM_BUILD_ROOT%{_bindir}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-ln -s . $RPM_BUILD_ROOT%{_includedir}/freetype2/freetype
-
 %if %{with x11}
 install -p ft2demos-*/bin/.libs/ft* $RPM_BUILD_ROOT%{_bindir}
 %endif
@@ -253,6 +270,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/freetype2
 %{_aclocaldir}/freetype2.m4
 %{_pkgconfigdir}/freetype2.pc
+%{_mandir}/man1/freetype-config.1*
 
 %if %{with apidocs}
 %files apidocs