.gitignore

@@ -1 +1,19 @@
-/onig-*.tar.gz
+onig-5.9.2.tar.gz
+/onig-5.9.3.tar.gz
+/onig-5.9.4.tar.gz
+/onig-5.9.5.tar.gz
+/onig-5.9.6.tar.gz
+/onig-6.0.0.tar.gz
+/onig-6.1.1.tar.gz
+/onig-6.1.2.tar.gz
+/onig-6.1.3.tar.gz
+/onig-6.2.0.tar.gz
+/onig-6.3.0.tar.gz
+/onig-6.4.0.tar.gz
+/onig-6.5.0.tar.gz
+/onig-6.6.1.tar.gz
+/onig-6.7.0.tar.gz
+/onig-6.7.1.tar.gz
+/onig-6.8.1.tar.gz
+/onig-6.8.2.tar.gz
+/onig-6.9.0.tar.gz

create-tarball-from-git.sh

@@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -e
-set -x
-
-CURRENTDIR=$(pwd)
-PKGNAME=oniguruma
-TARNAME=onig
-
-TMPDIR=$(mktemp -d /var/tmp/$PKGNAME-XXXXXX)
-pushd $TMPDIR
-
-GITSCM=https://github.com/kkos/$PKGNAME.git
-
-git clone $GITSCM
-pushd $PKGNAME
-
-COMMIT=$(git log | head -n 1 | sed -e 's|^.*[ \t]||')
-SHORTCOMMIT=$(echo $COMMIT | cut -c-7)
-DATE=$(git show --format=%ci $COMMIT | head -n 1 | sed -e 's|[ \t].*$||')
-SHORTDATE=$(echo $DATE | sed -e 's|-||g')
-VERSION=$(cat configure.ac | grep AC_INIT | sed -n -e 's|^.*,[ \t]*\([0-9\.][0-9\.]*\).*$|\1|p')
-
-git log --format=fuller | head -n 12
-
-echo "VERSION=$VERSION"
-echo "COMMIT=$COMMIT"
-echo "DATE=$DATE"
-
-echo
-popd
-
-TARDIR=${TARNAME}-${VERSION}-${SHORTDATE}git${SHORTCOMMIT}
-ln -sf $PKGNAME $TARDIR
-tar czf ${TARDIR}.tar.gz ${TARDIR}/./ 
-
-mv ${TARDIR}.tar.gz ${CURRENTDIR}/
-popd
-
-rm -rf $TMPDIR
-

oniguruma.spec

@@ -1,45 +1,13 @@
-%undefine	_changelog_trimtime
-
-%global git_snapshot 0
-
-%if 0%{?git_snapshot}
-%define apply_git_patch git am
-%else
-%define apply_git_patch patch -p1
-%endif
-
-%if 0%{?git_snapshot}
-%global         gitdate       20230501
-%global         gitcommit     41a3b802af2155eef6d648aa3608e39605110642
-%global         shortcommit   %(c=%{gitcommit}; echo ${c:0:7})
-
-%global         gitversion    %{gitdate}git%{shortcommit}
-%endif
-
-%global	mainver	6.9.10
-#%%global	postver	1
-#%%global	betaver	rc4
-#%%define	prerelease	1
-
-%global	baserelease	5
-
 Name:		oniguruma
-Version:	%{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}}
-Release:	%{?prerelease:0.}%{baserelease}%{?dist}
+Version:	6.9.0
+Release:	1%{?dist}
 Summary:	Regular expressions library
 
-# SPDX confirmed
-License:	BSD-2-Clause
-URL:		https://github.com/kkos/oniguruma/
-Source0:	https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?postver:.%postver}%{?betaver:-%betaver}%{?gitversion:-%{?gitversion}}.tar.gz
-Source1:	create-tarball-from-git.sh
+License:	BSD
+URL:		https://github.com/kkos/oniguruma
+Source0:	%{url}/releases/download/v%{version}/onig-%{version}.tar.gz
 
-BuildRequires:	make
 BuildRequires:	gcc
-%if 0%{?git_snapshot}
-BuildRequires:  automake
-BuildRequires:  libtool
-%endif
 
 %description
 Oniguruma is a regular expressions library.
@@ -47,7 +15,6 @@ The characteristics of this library is that different character encoding
 for every regular expression object can be specified.
 (supported APIs: GNU regex, POSIX and Oniguruma native)
 
-
 %package	devel
 Summary:	Development files for %{name}
 Requires:	%{name}%{?isa} = %{version}-%{release}
@@ -56,208 +23,46 @@ Requires:	%{name}%{?isa} = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
-
 %prep
-%setup -q -n onig-%{mainver}%{?gitversion:-%{?gitversion}}
+%setup -q -n onig-%{version}
 %{__sed} -i.multilib -e 's|-L@libdir@||' onig-config.in
 
 %build
-# This package fails its testsuite when compiled with LTO, but the real problem
-# is that it ends up mixing and matching regexp bits between itself and glibc.
-# Disable LTO
-%define _lto_cflags %{nil}
-
-%if 0%{?git_snapshot}
-autoreconf -fi
-%endif
-
 %configure \
-	--enable-posix-api \
-	--enable-binary-compatible-posix-api \
 	--disable-silent-rules \
 	--disable-static \
-	--with-rubydir=%{_bindir} \
-	%{nil}
+	--with-rubydir=%{_bindir}
 %make_build
 
 %install
 %make_install
+find %{buildroot} -type f -name '*.la' -print -delete
+find doc -mindepth 1 -type f -name '*.ja' -prune -o -print0 | xargs -0 echo "%%doc" > doc.files
+find doc -mindepth 1 -type f -name '*.ja' -print0 | xargs -0 echo "%%lang(ja) %%doc" >> doc.files
 
 %check
-%{__make} check
+%make_build check
 
 %ldconfig_scriptlets
 
-
 %files
-%defattr(-,root,root,-)
-%doc	AUTHORS
-%license	COPYING
-%doc	HISTORY
-%doc	README.md
-%doc	index.html
-%lang(ja)	%doc	README_japanese
-%lang(ja)	%doc	index_ja.html
-
+%license COPYING
+%doc AUTHORS HISTORY
+%doc README.md
+%lang(ja) %doc README.md
+%doc index.html
+%lang(ja) %doc index_ja.html
 %{_libdir}/libonig.so.5*
 
-%files devel
-%defattr(-,root,root,-)
-%doc	doc/API
-%doc	doc/CALLOUTS.API
-%doc	doc/CALLOUTS.BUILTIN
-%doc	doc/FAQ
-%doc	doc/RE
-%doc	doc/SYNTAX.md
-%doc	doc/UNICODE_PROPERTIES
-%lang(ja)	%doc	doc/API.ja
-%lang(ja)	%doc	doc/CALLOUTS.API.ja
-%lang(ja)	%doc	doc/CALLOUTS.BUILTIN.ja
-%lang(ja)	%doc	doc/FAQ.ja
-%lang(ja)	%doc	doc/RE.ja
-
+%files devel -f doc.files
 %{_bindir}/onig-config
-
 %{_libdir}/libonig.so
 %{_includedir}/onig*.h
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
-* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.10-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
-
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.10-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.10-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.10-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Jan 01 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.10-1
-- 6.9.10
-
-* Mon Nov 18 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.9-5
-- Apply upstream patch for C23 compliance
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.9-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.9-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Oct 17 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.9-1
-- 6.9.9
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.8^20230501git41a3b80-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* 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
-
-* Fri Sep 23 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.8-2.D20220919gitb041f6d
-- Update to the latest git, expecially:
-  - Update to Unicode 15.0 (upstream #272)
-  - [[:punct:]] behavoir change (upsteam #268)
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.8-1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Apr 30 2022 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.8-1
-- 6.9.8
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.7.1-1.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.7.1-1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sat May  1 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.7.1-1
-- 6.9.7.1
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.6-1.2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Nov  5 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-1
-- 6.9.6
-
-* Wed Oct 21 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-0.4.rc4
-- 6.9.6 rc4
-
-* Tue Oct 20 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-0.3.rc3
-- Apply upstream patch for upstream bug 221
-  - Revert change for false CVE-2020-26159 issue
-    https://github.com/kkos/oniguruma/issues/221
-
-* Sat Oct 17 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-0.2.rc3
-- 6.9.6 rc3
-
-* Mon Oct 12 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.6-0.1.rc2
-- 6.9.6 rc2
-- Apply upstream patch to keep binary compatibility with 6.9.5
-
-* Thu Oct  1 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.5-3.rev1
-- Apply upstream fix for CVE-2020-26159
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.5-2.rev1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 6.9.5-2.rev1.1
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Wed Jul  1 2020 Jeff Law <law@redhat.com> - 6.9.5-2.rev1
-- Disable LTO
-
-* Thu May  7 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.5-1.rev1
-- 6.9.5 revised 1
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.4-1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Nov 29 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.4-1
-- 6.9.4 final
-
-* Fri Nov 29 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.4-0.2.rc3
-- 6.9.4 rc3 (CVE-2019-19204 CVE-2019-19203 CVE-2019-19012)
-
-* Sat Nov  9 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.4-0.1.rc1
-- 6.9.4 rc1 (CVE-2019-19246)
-
-* Sun Aug 11 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.3-1
-- 6.9.3 (CVE-2019-13224 CVE-2019-13225 CVE-2019-16163)
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.2-2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jul 12 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.2-2
-- Upstream patch for CVE-2019-13225 (#1728966)
-- NON-upstream patch for CVE-2019-13224 (#1728971)
-
-* Tue May  7 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.2-1
-- rc3 released as 6.9.2 final release
-
-* Wed Apr 24 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.2-0.1.rc3
-- 6.9.2-rc3
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.9.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Wed Dec 12 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.1-1
-- 6.9.1
-
-* Wed Sep 12 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.9.0-2
-- 6.9.0
-
-* Sat Sep  8 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 6.8.2-3
-- Bump release
+* Sat Sep 08 2018 Igor Gnatenko <ignatenkorbain@fedoraproject.org> - 6.9.0-1
+- Update to 6.9.0
 
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

sources

@@ -1 +1 @@
-SHA512 (onig-6.9.10.tar.gz) = f7cf33008ca0181322fb8efc8e6bb67a1f81677095a33d88134781b804e6a9fbf675f05789d762fdd3d9f0171f8dc4c2e960c2b6a09ddd03bfd35a5ab0920317
+SHA512 (onig-6.9.0.tar.gz) = 75d0f0406ad4313332a10990157cede5c2738d2b9b6aa780a99d2651f185e1de12dba57c919ee58ccef0633b1d703e67935af5ea4b36895279457a189b8825df