From dd6bc1b9411329fe4f85802e7c2a4d339e364c9e Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 5 Nov 2020 07:06:35 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/oniguruma.git#bf259564dc7514540bf540a2460d0baf163ea4bc --- .gitignore | 1 + oniguruma.spec | 15 +++++++++------ sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b1385bb..c92d174 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ onig-5.9.2.tar.gz /onig-6.9.6-rc2.tar.gz /onig-6.9.6-rc3.tar.gz /onig-6.9.6-rc4.tar.gz +/onig-6.9.6.tar.gz diff --git a/oniguruma.spec b/oniguruma.spec index eb77af8..7997ed9 100644 --- a/oniguruma.spec +++ b/oniguruma.spec @@ -1,10 +1,10 @@ %undefine _changelog_trimtime %global mainver 6.9.6 -%global betaver rc4 -%define prerelease 1 +#%%global betaver rc4 +#%%define prerelease 1 -%global fedorarel 4 +%global fedorarel 1 Name: oniguruma Version: %{mainver} @@ -100,8 +100,11 @@ find $RPM_BUILD_ROOT -name '*.la' \ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Nov 5 2020 Mamoru TASAKA - 6.9.6-1 +- 6.9.6 + * Wed Oct 21 2020 Mamoru TASAKA - 6.9.6-0.4.rc4 -- 6.9.2 rc4 +- 6.9.6 rc4 * Tue Oct 20 2020 Mamoru TASAKA - 6.9.6-0.3.rc3 - Apply upstream patch for upstream bug 221 @@ -109,10 +112,10 @@ find $RPM_BUILD_ROOT -name '*.la' \ https://github.com/kkos/oniguruma/issues/221 * Sat Oct 17 2020 Mamoru TASAKA - 6.9.6-0.2.rc3 -- 6.9.2 rc3 +- 6.9.6 rc3 * Mon Oct 12 2020 Mamoru TASAKA - 6.9.6-0.1.rc2 -- 6.9.2 rc2 +- 6.9.6 rc2 - Apply upstream patch to keep binary compatibility with 6.9.5 * Thu Oct 1 2020 Mamoru TASAKA - 6.9.5-3.rev1 diff --git a/sources b/sources index 15d2dc0..fe38b65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (onig-6.9.6-rc4.tar.gz) = 3fdee2986c1e2049d72372692ca8d0d3afa0c4a853b2e30bf7f26409179fcbca92ee5a3b66ec8c8eb4b7084207b9584fbbd07955ddd5b085da1a299f9b602ebf +SHA512 (onig-6.9.6.tar.gz) = eb44f70347f49945fe054ad65370dbfd6b30b2e8442fb90b6c72413b7f9a8cb77ca98d1a4714d1d32b763551430436cc0175c0efaf2c73268363a9b6ecb5e3bc