!6 version update

Merge pull request !6 from yeah_wang/master

CVE-2019-18397.patch

@@ -1,25 +0,0 @@
-From 034c6e9a1d296286305f4cfd1e0072b879f52568 Mon Sep 17 00:00:00 2001
-From: Dov Grobgeld <dov.grobgeld@gmail.com>
-Date: Thu, 24 Oct 2019 09:37:29 +0300
-Subject: [PATCH] Truncate isolate_level to FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL
-
----
- lib/fribidi-bidi.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c
-index 6c84392..d384878 100644
---- a/lib/fribidi-bidi.c
-+++ b/lib/fribidi-bidi.c
-@@ -747,7 +747,9 @@ fribidi_get_par_embedding_levels_ex (
-             }
- 
- 	  RL_LEVEL (pp) = level;
--          RL_ISOLATE_LEVEL (pp) = isolate_level++;
-+          RL_ISOLATE_LEVEL (pp) = isolate_level;
-+          if (isolate_level < FRIBIDI_BIDI_MAX_EXPLICIT_LEVEL-1)
-+              isolate_level++;
-           base_level_per_iso_level[isolate_level] = new_level;
- 
- 	  if (!FRIBIDI_IS_NEUTRAL (override))
-

fribidi.spec

@@ -1,13 +1,12 @@
 Name:           fribidi
-Version:        1.0.5
+Version:        1.0.10
-Release:        4
+Release:        1
 Summary:        Library implementing the Unicode Bidirectional Algorithm
 License:        LGPLv2+ and UCD
 URL:            https://github.com/fribidi/fribidi/
-Source:         https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
+Source:         https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
 
-BuildRequires:  gcc automake autoconf libtool
+BuildRequires:  gcc meson
-Patch6000:      CVE-2019-18397.patch
 
 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@@ -23,17 +22,16 @@ Include files and libraries needed for developing applications which use FriBidi
 
 %prep
 %autosetup -n %{name}-%{version} -p1
-autoreconf -i
 
 %build
-%configure --disable-static --disable-docs
+%meson -Ddocs=false
-%make_build
+%meson_build
 
 %check
-make check
+%meson_test
 
 %install
-%make_install
+%meson_install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %post -p /sbin/ldconfig
@@ -51,9 +49,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_includedir}/fribidi
 %{_libdir}/libfribidi.so
 %{_libdir}/pkgconfig/*.pc
-%{_mandir}/man3/*.gz
+#%%{_mandir}/man3/*.gz
 
 %changelog
+* Mon Jul 20 2020 wangye <wangye70@huawei.com> - 1.0.10-1
+- version update to 1.0.10
+
 * Sun Jan 12 2020 zhangrui <zhangrui182@huawei.com> - 1.0.5-4
 - fix CVE-2019-18397