missing patch update

[packages/freetype.git] / freetype.spec

diff --git a/freetype.spec b/freetype.spec
index 03844d362c0e95230758fa5c7137ffce55c779f7..f71caa67204235298c3ed3e131703e233a4d3c4e 100644 (file)
--- a/freetype.spec
+++ b/freetype.spec
@@ -4,6 +4,7 @@
 %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
@@ -13,27 +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.6.5
+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: 6a386964e18ba28cb93370e57a19031b
+# Source0-md5: a717e6925b61b9dda946322ecd278a42
 Source1:       http://download.savannah.gnu.org/releases/freetype/%{name}-doc-%{version}.tar.bz2
-# Source1-md5: 27c57dbcd569bf8d45866112c2b0679b
+# Source1-md5: a41f85729ce4936e297d869957635e20
 Source2:       http://download.savannah.gnu.org/releases/freetype/ft2demos-%{version}.tar.bz2
-# Source2-md5: b8185d15751e9decd21d0e7e63cccbf6
+# Source2-md5: 3b0202eafd9282cb5d70d0a57de489d4
 Patch0:                %{name}-2.2.1-enable-valid.patch
 Patch1:                ft2demos-includes.patch
 URL:           http://www.freetype.org/
 BuildRequires: automake
 BuildRequires: bzip2-devel
-%{?with_harfbuzz:BuildRequires:        harfbuzz-devel >= 0.9.19}
+%{?with_harfbuzz:BuildRequires:        harfbuzz-devel >= 0.9.21}
 BuildRequires: libpng-devel
 BuildRequires: pkgconfig >= 1:0.24
-BuildRequires: python
-BuildRequires: python-modules
+%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"
@@ -110,7 +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.19}
+%{?with_harfbuzz:Requires:     harfbuzz-devel >= 0.9.21}
 Requires:      libpng-devel
 Requires:      zlib-devel
 Obsoletes:     freetype2-devel
@@ -217,7 +221,7 @@ CFLAGS="%{rpmcflags} %{rpmcppflags} \
 %{?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} \
@@ -230,7 +234,9 @@ CC="%{__cc}" \
        X11_LIB=%{?_x_libraries}
 %endif
 
+%if %{with regen_refdoc}
 %{__make} refdoc
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT