From 1700913c02e32341234ec44d35653bc98d4fd95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Fri, 24 Feb 2023 15:07:18 +0000 Subject: [PATCH 01/13] migrated to SPDX license --- fribidi.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fribidi.spec b/fribidi.spec index 8ca6efc..acd8eaf 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,10 +1,10 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi Version: 1.0.12 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz -License: LGPLv2+ and UCD +License: LGPL-2.1-or-later AND Unicode-DFS-2016 BuildRequires: gcc %if 0%{?rhel} && 0%{?rhel} <= 8 BuildRequires: automake autoconf libtool @@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Fri Feb 24 2023 Caolán McNamara - 1.0.12-4 +- migrated to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 1.0.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From c240741aaae72986f07d907b3d68cb90fe3b224d Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 17 May 2023 17:16:06 +0900 Subject: [PATCH 02/13] New upstream release. Resolves: rhbz#2207796 --- .gitignore | 1 + fribidi-drop-bundled-gnulib.patch | 46 +++++++++++++++---------------- fribidi.spec | 8 ++++-- sources | 2 +- 4 files changed, 31 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 11d5eeb..493abf0 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /fribidi-1.0.10.tar.xz /fribidi-1.0.11.tar.xz /fribidi-1.0.12.tar.xz +/fribidi-1.0.13.tar.xz diff --git a/fribidi-drop-bundled-gnulib.patch b/fribidi-drop-bundled-gnulib.patch index 7857369..4e8a82d 100644 --- a/fribidi-drop-bundled-gnulib.patch +++ b/fribidi-drop-bundled-gnulib.patch @@ -1,6 +1,6 @@ -diff -pruN fribidi-1.0.10.orig/bin/Makefile.am fribidi-1.0.10/bin/Makefile.am ---- fribidi-1.0.10.orig/bin/Makefile.am 2020-07-06 04:17:23.000000000 +0900 -+++ fribidi-1.0.10/bin/Makefile.am 2020-07-07 21:09:49.076237457 +0900 +diff -pruN fribidi-1.0.13.orig/bin/Makefile.am fribidi-1.0.13/bin/Makefile.am +--- fribidi-1.0.13.orig/bin/Makefile.am 2020-07-06 04:17:23.000000000 +0900 ++++ fribidi-1.0.13/bin/Makefile.am 2023-05-17 17:09:19.965214651 +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.10.orig/bin/Makefile.am fribidi-1.0.10/bin/Makefile.am AM_CPPFLAGS = \ @FRIBIDI_CPPFLAGS@ \ -diff -pruN fribidi-1.0.10.orig/bin/getopt.c fribidi-1.0.10/bin/getopt.c ---- fribidi-1.0.10.orig/bin/getopt.c 2015-08-05 03:49:07.000000000 +0900 -+++ fribidi-1.0.10/bin/getopt.c 1970-01-01 09:00:00.000000000 +0900 +diff -pruN fribidi-1.0.13.orig/bin/getopt.c fribidi-1.0.13/bin/getopt.c +--- fribidi-1.0.13.orig/bin/getopt.c 2015-08-05 03:49:07.000000000 +0900 ++++ fribidi-1.0.13/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.10.orig/bin/getopt.c fribidi-1.0.10/bin/getopt.c -} - -#endif /* TEST */ -diff -pruN fribidi-1.0.10.orig/bin/getopt.h fribidi-1.0.10/bin/getopt.h ---- fribidi-1.0.10.orig/bin/getopt.h 2015-08-05 03:49:07.000000000 +0900 -+++ fribidi-1.0.10/bin/getopt.h 1970-01-01 09:00:00.000000000 +0900 +diff -pruN fribidi-1.0.13.orig/bin/getopt.h fribidi-1.0.13/bin/getopt.h +--- fribidi-1.0.13.orig/bin/getopt.h 2015-08-05 03:49:07.000000000 +0900 ++++ fribidi-1.0.13/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.10.orig/bin/getopt.h fribidi-1.0.10/bin/getopt.h -#undef __need_getopt - -#endif /* getopt.h */ -diff -pruN fribidi-1.0.10.orig/bin/getopt1.c fribidi-1.0.10/bin/getopt1.c ---- fribidi-1.0.10.orig/bin/getopt1.c 2015-08-05 03:49:07.000000000 +0900 -+++ fribidi-1.0.10/bin/getopt1.c 1970-01-01 09:00:00.000000000 +0900 +diff -pruN fribidi-1.0.13.orig/bin/getopt1.c fribidi-1.0.13/bin/getopt1.c +--- fribidi-1.0.13.orig/bin/getopt1.c 2015-08-05 03:49:07.000000000 +0900 ++++ fribidi-1.0.13/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.10.orig/bin/getopt1.c fribidi-1.0.10/bin/getopt1.c -} - -#endif /* TEST */ -diff -pruN fribidi-1.0.10.orig/bin/getopt_int.h fribidi-1.0.10/bin/getopt_int.h ---- fribidi-1.0.10.orig/bin/getopt_int.h 2015-08-05 03:49:07.000000000 +0900 -+++ fribidi-1.0.10/bin/getopt_int.h 1970-01-01 09:00:00.000000000 +0900 +diff -pruN fribidi-1.0.13.orig/bin/getopt_int.h fribidi-1.0.13/bin/getopt_int.h +--- fribidi-1.0.13.orig/bin/getopt_int.h 2015-08-05 03:49:07.000000000 +0900 ++++ fribidi-1.0.13/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,20 +1844,20 @@ diff -pruN fribidi-1.0.10.orig/bin/getopt_int.h fribidi-1.0.10/bin/getopt_int.h -); - -#endif /* getopt_int.h */ -diff -pruN fribidi-1.0.10.orig/bin/gettext.h fribidi-1.0.10/bin/gettext.h ---- fribidi-1.0.10.orig/bin/gettext.h 2015-08-05 03:49:07.000000000 +0900 -+++ fribidi-1.0.10/bin/gettext.h 1970-01-01 09:00:00.000000000 +0900 +diff -pruN fribidi-1.0.13.orig/bin/gettext.h fribidi-1.0.13/bin/gettext.h +--- fribidi-1.0.13.orig/bin/gettext.h 2015-08-05 03:49:07.000000000 +0900 ++++ fribidi-1.0.13/bin/gettext.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,2 +0,0 @@ -#undef gettext -#define gettext -diff -pruN fribidi-1.0.10.orig/bin/meson.build fribidi-1.0.10/bin/meson.build ---- fribidi-1.0.10.orig/bin/meson.build 2020-07-06 04:17:23.000000000 +0900 -+++ fribidi-1.0.10/bin/meson.build 2020-07-07 21:10:30.931408884 +0900 +diff -pruN fribidi-1.0.13.orig/bin/meson.build fribidi-1.0.13/bin/meson.build +--- fribidi-1.0.13.orig/bin/meson.build 2023-05-17 03:47:48.000000000 +0900 ++++ fribidi-1.0.13/bin/meson.build 2023-05-17 17:11:43.178425907 +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'] + fribidi_static_cargs + visibility_args, + c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs, include_directories: incs, link_with: libfribidi, install: true) @@ -1865,6 +1865,6 @@ diff -pruN fribidi-1.0.10.orig/bin/meson.build fribidi-1.0.10/bin/meson.build 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'] + fribidi_static_cargs + visibility_args, + c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs, include_directories: incs, link_with: libfribidi, diff --git a/fribidi.spec b/fribidi.spec index acd8eaf..03e82f7 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi -Version: 1.0.12 -Release: 4%{?dist} +Version: 1.0.13 +Release: 1%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz License: LGPL-2.1-or-later AND Unicode-DFS-2016 @@ -84,6 +84,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Wed May 17 2023 Akira TAGOH - 1.0.13-1 +- New upstream release. + Resolves: rhbz#2207796 + * Fri Feb 24 2023 Caolán McNamara - 1.0.12-4 - migrated to SPDX license diff --git a/sources b/sources index 50d020c..f806635 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fribidi-1.0.12.tar.xz) = cd624f519b270303e89139ced4020115abe3b6a0d774ba57f17fa69c6036edebd76c635a42c468786e76c6ffb0c7d63b435cd2663bc2fba08dec405840dd8e49 +SHA512 (fribidi-1.0.13.tar.xz) = 09357d842ff9e05b918f826e28e4a25ad996e17f73242ee9ce53fae9f37ec6c639f9cae4271577f6e0269f34265afc893858225c4a94610f0a6ee7580fb1fe07 From 5379fcc2127cdbb22c4dfd6b4e56a19aac5fccc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 20:17:50 +0000 Subject: [PATCH 03/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- fribidi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fribidi.spec b/fribidi.spec index 03e82f7..4f21903 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi Version: 1.0.13 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz License: LGPL-2.1-or-later AND Unicode-DFS-2016 @@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed May 17 2023 Akira TAGOH - 1.0.13-1 - New upstream release. Resolves: rhbz#2207796 From 93683706b3de0069d7a2b3fe547c76bfffefc9da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 19:49:43 +0000 Subject: [PATCH 04/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fribidi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fribidi.spec b/fribidi.spec index 4f21903..ac3aeb4 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi Version: 1.0.13 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz License: LGPL-2.1-or-later AND Unicode-DFS-2016 @@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.0.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.0.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 011e12784e5c562807c884b19ac8e3fb7e063139 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 12:04:42 +0000 Subject: [PATCH 05/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- fribidi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fribidi.spec b/fribidi.spec index ac3aeb4..2998dfa 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi Version: 1.0.13 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz License: LGPL-2.1-or-later AND Unicode-DFS-2016 @@ -84,6 +84,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.0.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.0.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From b277cca91739c7982dd4fa722952943dcaf76572 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 7 May 2024 21:43:30 +0900 Subject: [PATCH 06/13] New upstream release. Resolves: rhbz#2277227 --- .gitignore | 1 + fribidi-drop-bundled-gnulib.patch | 49 ++++++++++++++++--------------- fribidi.spec | 8 +++-- sources | 2 +- 4 files changed, 34 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 493abf0..756e727 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /fribidi-1.0.11.tar.xz /fribidi-1.0.12.tar.xz /fribidi-1.0.13.tar.xz +/fribidi-1.0.14.tar.xz diff --git a/fribidi-drop-bundled-gnulib.patch b/fribidi-drop-bundled-gnulib.patch index 4e8a82d..1315922 100644 --- a/fribidi-drop-bundled-gnulib.patch +++ b/fribidi-drop-bundled-gnulib.patch @@ -1,6 +1,6 @@ -diff -pruN fribidi-1.0.13.orig/bin/Makefile.am fribidi-1.0.13/bin/Makefile.am ---- fribidi-1.0.13.orig/bin/Makefile.am 2020-07-06 04:17:23.000000000 +0900 -+++ fribidi-1.0.13/bin/Makefile.am 2023-05-17 17:09:19.965214651 +0900 +diff -pruN fribidi-1.0.14.orig/bin/Makefile.am fribidi-1.0.14/bin/Makefile.am +--- fribidi-1.0.14.orig/bin/Makefile.am 2020-07-06 04:17:23.000000000 +0900 ++++ fribidi-1.0.14/bin/Makefile.am 2024-05-07 21:40:04.500166714 +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.13.orig/bin/Makefile.am fribidi-1.0.13/bin/Makefile.am AM_CPPFLAGS = \ @FRIBIDI_CPPFLAGS@ \ -diff -pruN fribidi-1.0.13.orig/bin/getopt.c fribidi-1.0.13/bin/getopt.c ---- fribidi-1.0.13.orig/bin/getopt.c 2015-08-05 03:49:07.000000000 +0900 -+++ fribidi-1.0.13/bin/getopt.c 1970-01-01 09:00:00.000000000 +0900 +diff -pruN fribidi-1.0.14.orig/bin/getopt.c fribidi-1.0.14/bin/getopt.c +--- fribidi-1.0.14.orig/bin/getopt.c 2015-08-05 03:49:07.000000000 +0900 ++++ fribidi-1.0.14/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.13.orig/bin/getopt.c fribidi-1.0.13/bin/getopt.c -} - -#endif /* TEST */ -diff -pruN fribidi-1.0.13.orig/bin/getopt.h fribidi-1.0.13/bin/getopt.h ---- fribidi-1.0.13.orig/bin/getopt.h 2015-08-05 03:49:07.000000000 +0900 -+++ fribidi-1.0.13/bin/getopt.h 1970-01-01 09:00:00.000000000 +0900 +diff -pruN fribidi-1.0.14.orig/bin/getopt.h fribidi-1.0.14/bin/getopt.h +--- fribidi-1.0.14.orig/bin/getopt.h 2015-08-05 03:49:07.000000000 +0900 ++++ fribidi-1.0.14/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.13.orig/bin/getopt.h fribidi-1.0.13/bin/getopt.h -#undef __need_getopt - -#endif /* getopt.h */ -diff -pruN fribidi-1.0.13.orig/bin/getopt1.c fribidi-1.0.13/bin/getopt1.c ---- fribidi-1.0.13.orig/bin/getopt1.c 2015-08-05 03:49:07.000000000 +0900 -+++ fribidi-1.0.13/bin/getopt1.c 1970-01-01 09:00:00.000000000 +0900 +diff -pruN fribidi-1.0.14.orig/bin/getopt1.c fribidi-1.0.14/bin/getopt1.c +--- fribidi-1.0.14.orig/bin/getopt1.c 2015-08-05 03:49:07.000000000 +0900 ++++ fribidi-1.0.14/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.13.orig/bin/getopt1.c fribidi-1.0.13/bin/getopt1.c -} - -#endif /* TEST */ -diff -pruN fribidi-1.0.13.orig/bin/getopt_int.h fribidi-1.0.13/bin/getopt_int.h ---- fribidi-1.0.13.orig/bin/getopt_int.h 2015-08-05 03:49:07.000000000 +0900 -+++ fribidi-1.0.13/bin/getopt_int.h 1970-01-01 09:00:00.000000000 +0900 +diff -pruN fribidi-1.0.14.orig/bin/getopt_int.h fribidi-1.0.14/bin/getopt_int.h +--- fribidi-1.0.14.orig/bin/getopt_int.h 2015-08-05 03:49:07.000000000 +0900 ++++ fribidi-1.0.14/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,23 +1844,26 @@ diff -pruN fribidi-1.0.13.orig/bin/getopt_int.h fribidi-1.0.13/bin/getopt_int.h -); - -#endif /* getopt_int.h */ -diff -pruN fribidi-1.0.13.orig/bin/gettext.h fribidi-1.0.13/bin/gettext.h ---- fribidi-1.0.13.orig/bin/gettext.h 2015-08-05 03:49:07.000000000 +0900 -+++ fribidi-1.0.13/bin/gettext.h 1970-01-01 09:00:00.000000000 +0900 +diff -pruN fribidi-1.0.14.orig/bin/gettext.h fribidi-1.0.14/bin/gettext.h +--- fribidi-1.0.14.orig/bin/gettext.h 2015-08-05 03:49:07.000000000 +0900 ++++ fribidi-1.0.14/bin/gettext.h 1970-01-01 09:00:00.000000000 +0900 @@ -1,2 +0,0 @@ -#undef gettext -#define gettext -diff -pruN fribidi-1.0.13.orig/bin/meson.build fribidi-1.0.13/bin/meson.build ---- fribidi-1.0.13.orig/bin/meson.build 2023-05-17 03:47:48.000000000 +0900 -+++ fribidi-1.0.13/bin/meson.build 2023-05-17 17:11:43.178425907 +0900 -@@ -1,12 +1,12 @@ +diff -pruN fribidi-1.0.14.orig/bin/meson.build fribidi-1.0.14/bin/meson.build +--- fribidi-1.0.14.orig/bin/meson.build 2024-03-18 03:10:09.000000000 +0900 ++++ fribidi-1.0.14/bin/meson.build 2024-05-07 21:40:55.573086578 +0900 +@@ -1,7 +1,7 @@ + # The fribidi binary is used by the test setup, so if bin=false we still + # need to build it for internal usage, we just won't install it. 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'] + fribidi_static_cargs, include_directories: incs, link_with: libfribidi, - install: true) +@@ -12,7 +12,7 @@ if not get_option('bin') + endif executable('fribidi-benchmark', - 'fribidi-benchmark.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h, diff --git a/fribidi.spec b/fribidi.spec index 2998dfa..0077a18 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi -Version: 1.0.13 -Release: 4%{?dist} +Version: 1.0.14 +Release: 1%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz License: LGPL-2.1-or-later AND Unicode-DFS-2016 @@ -84,6 +84,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Tue May 7 2024 Akira TAGOH - 1.0.14-1 +- New upstream release. + Resolves: rhbz#2277227 + * Wed Jan 24 2024 Fedora Release Engineering - 1.0.13-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index f806635..602a29a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fribidi-1.0.13.tar.xz) = 09357d842ff9e05b918f826e28e4a25ad996e17f73242ee9ce53fae9f37ec6c639f9cae4271577f6e0269f34265afc893858225c4a94610f0a6ee7580fb1fe07 +SHA512 (fribidi-1.0.14.tar.xz) = 70270826625767a916156c9d752d8ad02c71b33d532060981680942c5121746bb9b0272a3f2188b9019e841c642d1ad686bbc3e7ba54a2f951baa532b01b059a From b89fbd9492ea6fcd2890f6f655343fa2bc424649 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 5 Jun 2024 20:43:46 +0900 Subject: [PATCH 07/13] Fix broken data in fribidi. Resolves: rhbz#2279842 --- fribidi.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/fribidi.spec b/fribidi.spec index 0077a18..ed575ff 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi Version: 1.0.14 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz License: LGPL-2.1-or-later AND Unicode-DFS-2016 @@ -32,6 +32,10 @@ FriBidi. %if 0%{?rhel} && 0%{?rhel} <= 8 autoreconf -i %endif +# Clean up older file in archive +(cd lib; + rm arabic-shaping.tab.i bidi-type.tab.i brackets*.tab.i joining-type.tab.i mirroring.tab.i fribidi-unicode-version.h +) %build %if 0%{?rhel} && 0%{?rhel} <= 8 @@ -84,6 +88,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Wed Jun 5 2024 Akira TAGOH - 1.0.14-2 +- Fix broken data in fribidi. + Resolves: rhbz#2279842 + * Tue May 7 2024 Akira TAGOH - 1.0.14-1 - New upstream release. Resolves: rhbz#2277227 @@ -364,4 +372,3 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la * Fri May 16 2003 Jeremy Katz 0.10.4-2 - Initial build in Red Hat Linux - From 88e747a2684f74c2311068e64b25912afbb657f4 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 10 Jun 2024 15:40:25 +0900 Subject: [PATCH 08/13] New upstream release. Resolves: rhbz#2291030 --- .gitignore | 1 + fribidi.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 756e727..70db7cf 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /fribidi-1.0.12.tar.xz /fribidi-1.0.13.tar.xz /fribidi-1.0.14.tar.xz +/fribidi-1.0.15.tar.xz diff --git a/fribidi.spec b/fribidi.spec index ed575ff..5dfb771 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi -Version: 1.0.14 -Release: 2%{?dist} +Version: 1.0.15 +Release: 1%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz License: LGPL-2.1-or-later AND Unicode-DFS-2016 @@ -88,6 +88,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Mon Jun 10 2024 Akira TAGOH - 1.0.15-1 +- New upstream release. + Resolves: rhbz#2291030 + * Wed Jun 5 2024 Akira TAGOH - 1.0.14-2 - Fix broken data in fribidi. Resolves: rhbz#2279842 diff --git a/sources b/sources index 602a29a..312ef7e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fribidi-1.0.14.tar.xz) = 70270826625767a916156c9d752d8ad02c71b33d532060981680942c5121746bb9b0272a3f2188b9019e841c642d1ad686bbc3e7ba54a2f951baa532b01b059a +SHA512 (fribidi-1.0.15.tar.xz) = 98295f1a7203f401d63cc1da7cce3be6975729055fea54640d25cf05a6e6bc27d2e1a3f8edd1ddf4c7fc5ff6f7f1e2daf2bf86683d4aed5988ade8bfa5da414f From 2fcd582490a1e317218db425876da2abdc7fd302 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 23:41:01 +0000 Subject: [PATCH 09/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- fribidi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fribidi.spec b/fribidi.spec index 5dfb771..7648156 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi Version: 1.0.15 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz License: LGPL-2.1-or-later AND Unicode-DFS-2016 @@ -88,6 +88,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.0.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jun 10 2024 Akira TAGOH - 1.0.15-1 - New upstream release. Resolves: rhbz#2291030 From dead9f70bebf2935d86641a21205240ae7cbbaac Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 23 Jul 2024 17:47:45 +0900 Subject: [PATCH 10/13] ci: Use tmt based test cases --- .fmf/version | 1 + plans/basic.fmf | 11 +++++++++++ tests/basic/main.fmf | 3 +++ tests/basic/test.sh | 31 +++++++++++++++++++++++++++++++ 4 files changed, 46 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/basic.fmf create mode 100644 tests/basic/main.fmf create mode 100755 tests/basic/test.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/basic.fmf b/plans/basic.fmf new file mode 100644 index 0000000..4d7984e --- /dev/null +++ b/plans/basic.fmf @@ -0,0 +1,11 @@ +summary: Basic smoke test +discover: + how: fmf + dist-git-source: true +prepare: + name: tmt + how: install + package: + - fribidi +execute: + how: tmt diff --git a/tests/basic/main.fmf b/tests/basic/main.fmf new file mode 100644 index 0000000..4b2193c --- /dev/null +++ b/tests/basic/main.fmf @@ -0,0 +1,3 @@ +summary: Basic test +test: ./test.sh +framework: beakerlib diff --git a/tests/basic/test.sh b/tests/basic/test.sh new file mode 100755 index 0000000..3156eac --- /dev/null +++ b/tests/basic/test.sh @@ -0,0 +1,31 @@ +#!/bin/bash +# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +rlJournalStart + rlPhaseStartSetup + rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" + rlRun "pushd $tmp" + rlRun "set -o pipefail" + rlPhaseEnd + + rlPhaseStartTest + rlRun "BUILD_PATH=$(rpm -q --qf '%{NAME}-%{VERSION}' fribidi)" 0 "Get the build path" + if test -d $TMT_SOURCE_DIR/$BUILD_PATH; then + for f in $TMT_SOURCE_DIR/$BUILD_PATH/test/*.input; do + ref=${f/.input/.reference} + cs=$(echo $f|cut -d_ -f2) + name=$(basename $f) + rlRun "fribidi -t -c $cs $f | tee output" 0 "Check $name for $cs" + rlRun "diff -U 0 output $ref" 0 "Check diff for $name" + done + else + rlDie "No build directory" + fi + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -r $tmp" 0 "Remove tmp directory" + rlPhaseEnd +rlJournalEnd From 00084b821d522b0ab81a03413fc974d745fa0ba4 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 27 Sep 2024 16:27:31 +0900 Subject: [PATCH 11/13] New upstream release. Resolves: rhbz#2314907 --- .gitignore | 1 + fribidi.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 70db7cf..99a12dc 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /fribidi-1.0.13.tar.xz /fribidi-1.0.14.tar.xz /fribidi-1.0.15.tar.xz +/fribidi-1.0.16.tar.xz diff --git a/fribidi.spec b/fribidi.spec index 7648156..3cf87da 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi -Version: 1.0.15 -Release: 2%{?dist} +Version: 1.0.16 +Release: 1%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz License: LGPL-2.1-or-later AND Unicode-DFS-2016 @@ -88,6 +88,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Fri Sep 27 2024 Akira TAGOH - 1.0.16-1 +- New upstream release. + Resolves: rhbz#2314907 + * Wed Jul 17 2024 Fedora Release Engineering - 1.0.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 312ef7e..173f0f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fribidi-1.0.15.tar.xz) = 98295f1a7203f401d63cc1da7cce3be6975729055fea54640d25cf05a6e6bc27d2e1a3f8edd1ddf4c7fc5ff6f7f1e2daf2bf86683d4aed5988ade8bfa5da414f +SHA512 (fribidi-1.0.16.tar.xz) = e3a56f36155f6813e3609473639fc533de742309f561c463012dc90b412a1ac7694b765d92669b2cbfaee973ca0e92fa5e926e68a1a078921f26ef17d82ab651 From 6c209994d26072d0c67f3f27109a78ff8b75be72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 18:52:41 +0000 Subject: [PATCH 12/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- fribidi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fribidi.spec b/fribidi.spec index 3cf87da..367cdca 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi Version: 1.0.16 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz License: LGPL-2.1-or-later AND Unicode-DFS-2016 @@ -88,6 +88,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.0.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Sep 27 2024 Akira TAGOH - 1.0.16-1 - New upstream release. Resolves: rhbz#2314907 From daca1c74f10105472f1a98839fd71ca394e4a87a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 20:49:20 +0000 Subject: [PATCH 13/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- fribidi.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fribidi.spec b/fribidi.spec index 367cdca..91570fa 100644 --- a/fribidi.spec +++ b/fribidi.spec @@ -1,7 +1,7 @@ Summary: Library implementing the Unicode Bidirectional Algorithm Name: fribidi Version: 1.0.16 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://github.com/fribidi/fribidi/ Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz License: LGPL-2.1-or-later AND Unicode-DFS-2016 @@ -88,6 +88,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%%{_mandir}/man3/*.gz %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.0.16-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 1.0.16-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild