From c240741aaae72986f07d907b3d68cb90fe3b224d Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 17 May 2023 17:16:06 +0900 Subject: [PATCH] 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