From 23331d4a51fe91499c696d71b601d08448d56748 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Sat, 6 May 2023 21:31:54 +0900
Subject: [PATCH] Update to the latest git

---
 create-tarball-from-git.sh |  2 +-
 oniguruma.spec             | 16 +++++++++-------
 sources                    |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/create-tarball-from-git.sh b/create-tarball-from-git.sh
index a4a5e0a..e23aadf 100644
--- a/create-tarball-from-git.sh
+++ b/create-tarball-from-git.sh
@@ -30,7 +30,7 @@ echo "DATE=$DATE"
 echo
 popd
 
-TARDIR=${TARNAME}-${VERSION}-D${SHORTDATE}git${SHORTCOMMIT}
+TARDIR=${TARNAME}-${VERSION}-${SHORTDATE}git${SHORTCOMMIT}
 ln -sf $PKGNAME $TARDIR
 tar czf ${TARDIR}.tar.gz ${TARDIR}/./ 
 
diff --git a/oniguruma.spec b/oniguruma.spec
index a5c01a7..bfe961b 100644
--- a/oniguruma.spec
+++ b/oniguruma.spec
@@ -9,11 +9,11 @@
 %endif
 
 %if 0%{?git_snapshot}
-%global         gitdate       20220919
-%global         gitcommit     b041f6dd9967531cf396a684194d67dc2e7480f7
+%global         gitdate       20230501
+%global         gitcommit     41a3b802af2155eef6d648aa3608e39605110642
 %global         shortcommit   %(c=%{gitcommit}; echo ${c:0:7})
 
-%global         gitversion    D%{gitdate}git%{shortcommit}
+%global         gitversion    %{gitdate}git%{shortcommit}
 %endif
 
 %global	mainver	6.9.8
@@ -21,11 +21,11 @@
 #%%global	betaver	rc4
 #%%define	prerelease	1
 
-%global	baserelease	2
+%global	baserelease	1
 
 Name:		oniguruma
-Version:	%{mainver}%{?postver:.%postver}
-Release:	%{?prerelease:0.}%{baserelease}%{?betaver:.%betaver}%{?gitversion:.%{?gitversion}}%{?dist}.1
+Version:	%{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}}
+Release:	%{?prerelease:0.}%{baserelease}%{?dist}
 Summary:	Regular expressions library
 
 # SPDX confirmed
@@ -80,7 +80,6 @@ autoreconf -fi
 	--with-rubydir=%{_bindir}
 %make_build
 
-
 %install
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -128,6 +127,9 @@ find $RPM_BUILD_ROOT -name '*.la' \
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Sat May  6 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.8^20230501git41a3b80-1
+- Update to the latest git
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.8-2.D20220919gitb041f6d.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index f3c3ae2..a855772 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (onig-6.9.8-D20220919gitb041f6d.tar.gz) = 8319e0c034e3e10ebcb4eeac09a2e6edd473128b85d0c26c24228a934d6bfd87a35e9bf89561d55b8210bae58130cf356a94fc532ed3abfbb3eb0e4360d0ab0d
+SHA512 (onig-6.9.8-20230501git41a3b80.tar.gz) = ea31fe43bb1803d34956e21ac022d8b2f90257f6e74819c78e679c85865d451725fdb8089c268dc988c125457d5f40a2c10b4e355a2c8197839b4ea32f0fa0a5