New upstream release.

Resolves: rhbz#1756212 Use meson to build.
2019-09-27 18:38:00 +09:00 · 2019-09-27 18:38:00 +09:00 · 10360073ba
commit 10360073ba
parent fc99f465b1
2 changed files with 60 additions and 21 deletions
--- a/fribidi-drop-bundled-gnulib.patch
+++ b/fribidi-drop-bundled-gnulib.patch
@ -1,6 +1,6 @@
-diff -pruN fribidi-1.0.4.orig/bin/Makefile.am fribidi-1.0.4/bin/Makefile.am
--- fribidi-1.0.4.orig/bin/Makefile.am	2018-02-19 21:25:06.000000000 +0000
-+++ fribidi-1.0.4/bin/Makefile.am	2018-07-26 09:53:02.746415439 +0000
+diff -pruN fribidi-1.0.6.orig/bin/Makefile.am fribidi-1.0.6/bin/Makefile.am
+--- fribidi-1.0.6.orig/bin/Makefile.am	2019-09-27 14:03:47.000000000 +0900
+++ fribidi-1.0.6/bin/Makefile.am	2019-09-27 18:14:02.407881337 +0900
@@ -2,11 +2,9 @@ bin_PROGRAMS = fribidi
 
 noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types fribidi-caprtl2utf8
@ -15,9 +15,9 @@ diff -pruN fribidi-1.0.4.orig/bin/Makefile.am fribidi-1.0.4/bin/Makefile.am
 
 AM_CPPFLAGS = \
 		-I$(top_builddir)/lib \
-diff -pruN fribidi-1.0.4.orig/bin/getopt.c fribidi-1.0.4/bin/getopt.c
--- fribidi-1.0.4.orig/bin/getopt.c	2018-02-03 20:57:13.000000000 +0000
-+++ fribidi-1.0.4/bin/getopt.c	1970-01-01 00:00:00.000000000 +0000
+diff -pruN fribidi-1.0.6.orig/bin/getopt.c fribidi-1.0.6/bin/getopt.c
+--- fribidi-1.0.6.orig/bin/getopt.c	2019-09-27 14:03:47.000000000 +0900
+++ fribidi-1.0.6/bin/getopt.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,1268 +0,0 @@
 -/* Getopt for GNU.
 -   NOTE: getopt is now part of the C library, so if you don't know what
@ -1287,9 +1287,9 @@ diff -pruN fribidi-1.0.4.orig/bin/getopt.c fribidi-1.0.4/bin/getopt.c
 -}
 -
 -#endif /* TEST */
-diff -pruN fribidi-1.0.4.orig/bin/getopt.h fribidi-1.0.4/bin/getopt.h
--- fribidi-1.0.4.orig/bin/getopt.h	2018-02-03 20:57:13.000000000 +0000
-+++ fribidi-1.0.4/bin/getopt.h	1970-01-01 00:00:00.000000000 +0000
+diff -pruN fribidi-1.0.6.orig/bin/getopt.h fribidi-1.0.6/bin/getopt.h
+--- fribidi-1.0.6.orig/bin/getopt.h	2019-09-27 14:03:47.000000000 +0900
+++ fribidi-1.0.6/bin/getopt.h	1970-01-01 09:00:00.000000000 +0900
@@ -1,187 +0,0 @@
 -/* Declarations for getopt.
 -   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@ -1478,9 +1478,9 @@ diff -pruN fribidi-1.0.4.orig/bin/getopt.h fribidi-1.0.4/bin/getopt.h
 -#undef __need_getopt
 -
 -#endif				/* getopt.h */
-diff -pruN fribidi-1.0.4.orig/bin/getopt1.c fribidi-1.0.4/bin/getopt1.c
--- fribidi-1.0.4.orig/bin/getopt1.c	2018-02-03 20:57:13.000000000 +0000
-+++ fribidi-1.0.4/bin/getopt1.c	1970-01-01 00:00:00.000000000 +0000
+diff -pruN fribidi-1.0.6.orig/bin/getopt1.c fribidi-1.0.6/bin/getopt1.c
+--- fribidi-1.0.6.orig/bin/getopt1.c	2019-09-27 14:03:47.000000000 +0900
+++ fribidi-1.0.6/bin/getopt1.c	1970-01-01 09:00:00.000000000 +0900
@@ -1,213 +0,0 @@
 -/* getopt_long and getopt_long_only entry points for GNU getopt.
 -   Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98,2004
@ -1695,9 +1695,9 @@ diff -pruN fribidi-1.0.4.orig/bin/getopt1.c fribidi-1.0.4/bin/getopt1.c
 -}
 -
 -#endif /* TEST */
-diff -pruN fribidi-1.0.4.orig/bin/getopt_int.h fribidi-1.0.4/bin/getopt_int.h
--- fribidi-1.0.4.orig/bin/getopt_int.h	2018-02-03 20:57:13.000000000 +0000
-+++ fribidi-1.0.4/bin/getopt_int.h	1970-01-01 00:00:00.000000000 +0000
+diff -pruN fribidi-1.0.6.orig/bin/getopt_int.h fribidi-1.0.6/bin/getopt_int.h
+--- fribidi-1.0.6.orig/bin/getopt_int.h	2019-09-27 14:03:47.000000000 +0900
+++ fribidi-1.0.6/bin/getopt_int.h	1970-01-01 09:00:00.000000000 +0900
@@ -1,145 +0,0 @@
 -/* Internal declarations for getopt.
 -   Copyright (C) 1989-1994,1996-1999,2001,2003,2004
@ -1844,9 +1844,27 @@ diff -pruN fribidi-1.0.4.orig/bin/getopt_int.h fribidi-1.0.4/bin/getopt_int.h
 -);
 -
 -#endif /* getopt_int.h */
-diff -pruN fribidi-1.0.4.orig/bin/gettext.h fribidi-1.0.4/bin/gettext.h
--- fribidi-1.0.4.orig/bin/gettext.h	2018-02-03 20:57:13.000000000 +0000
-+++ fribidi-1.0.4/bin/gettext.h	1970-01-01 00:00:00.000000000 +0000
+diff -pruN fribidi-1.0.6.orig/bin/gettext.h fribidi-1.0.6/bin/gettext.h
+--- fribidi-1.0.6.orig/bin/gettext.h	2019-09-27 14:03:47.000000000 +0900
+++ fribidi-1.0.6/bin/gettext.h	1970-01-01 09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
 -#undef gettext
 -#define gettext
+diff -pruN fribidi-1.0.6.orig/bin/meson.build fribidi-1.0.6/bin/meson.build
+--- fribidi-1.0.6.orig/bin/meson.build	2019-09-27 14:03:47.000000000 +0900
+++ fribidi-1.0.6/bin/meson.build	2019-09-27 18:15:26.375883489 +0900
+@@ -1,12 +1,12 @@
+ fribidi = executable('fribidi',
+-  'fribidi-main.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
+  'fribidi-main.c', fribidi_unicode_version_h,
+   c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+   include_directories: incs,
+   link_with: libfribidi,
+   install: true)
+ 
+ executable('fribidi-benchmark',
+-  'fribidi-benchmark.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
+  'fribidi-benchmark.c', fribidi_unicode_version_h,
+   c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+   include_directories: incs,
+   link_with: libfribidi,
--- a/fribidi.spec
+++ b/fribidi.spec
@ -6,8 +6,13 @@ URL: https://github.com/fribidi/fribidi/
 Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 License: LGPLv2+ and UCD
 BuildRequires: gcc
+%if 0%{?rhel} && 0%{?rhel} <= 8
 BuildRequires: automake autoconf libtool
+%else
+BuildRequires: meson
+%endif
 Patch0: %{name}-drop-bundled-gnulib.patch
+Patch1: %{name}-automake.patch

 %description
 A library to handle bidirectional scripts (for example Hebrew, Arabic),
@ -24,9 +29,12 @@ FriBidi.

 %prep
 %autosetup -p1
+%if 0%{?rhel} && 0%{?rhel} <= 8
 autoreconf -i
+%endif

 %build
+%if 0%{?rhel} && 0%{?rhel} <= 8
 %if 0%{?el5}
 # FORTIFY_SOURCE=2 breaks EL-5 build
 export CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's|FORTIFY_SOURCE=2|FORTIFY_SOURCE=1|'`
@ -40,19 +48,31 @@ export CFLAGS="$RPM_OPT_FLAGS -DPAGE_SIZE=4096"
 %endif
 %endif
 %configure --disable-static --disable-docs
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
+%else
+%meson -Ddocs=false
+%meson_build
+%endif

 %check
+%if 0%{?rhel} && 0%{?rhel} <= 8
 make check
+%else
+%meson_test
+%endif

 %install
+%if 0%{?rhel} && 0%{?rhel} <= 8
 make DESTDIR=$RPM_BUILD_ROOT install INSTALL="install -p"
+%else
+%meson_install
+%endif
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la

 %ldconfig_scriptlets

 %files
-%doc README AUTHORS ChangeLog THANKS NEWS TODO
+%doc README.md AUTHORS THANKS NEWS TODO
 %license COPYING
 %{_bindir}/fribidi
 %{_libdir}/libfribidi.so.0*
@ -61,12 +81,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_includedir}/fribidi
 %{_libdir}/libfribidi.so
 %{_libdir}/pkgconfig/*.pc
-%{_mandir}/man3/*.gz
+#%%{_mandir}/man3/*.gz

 %changelog
 * Fri Sep 27 2019 Akira TAGOH <tagoh@redhat.com> - 1.0.6-1
 - New upstream release.
  Resolves: rhbz#1756212
+- Use meson to build.

 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild