Compare commits

..

No commits in common. "rawhide" and "f34" have entirely different histories.

4 changed files with 49 additions and 136 deletions

33
.gitignore vendored
View file

@ -1 +1,32 @@
/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
/onig-6.9.1.tar.gz
/onig-6.9.2-rc3.tar.gz
/onig-6.9.2.tar.gz
/onig-6.9.3.tar.gz
/onig-6.9.4-rc1.tar.gz
/onig-6.9.4-rc3.tar.gz
/onig-6.9.4.tar.gz
/onig-6.9.5-rev1.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
/onig-6.9.7.1.tar.gz

View file

@ -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

View file

@ -1,45 +1,23 @@
%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 mainver 6.9.7
%global postver 1
#%%global betaver rc4
#%%define prerelease 1
%global baserelease 5
%global fedorarel 1
Name: oniguruma
Version: %{mainver}%{?postver:.%postver}%{?gitversion:^%{?gitversion}}
Release: %{?prerelease:0.}%{baserelease}%{?dist}
Version: %{mainver}%{?postver:.%postver}
Release: %{?prerelease:0.}%{fedorarel}%{?betaver:.%betaver}%{?dist}
Summary: Regular expressions library
# SPDX confirmed
License: BSD-2-Clause
License: BSD
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
Source0: https://github.com/kkos/oniguruma/releases/download/v%{mainver}%{?betaver:_%betaver}/onig-%{mainver}%{?postver:.%postver}%{?betaver:-%betaver}.tar.gz
BuildRequires: make
BuildRequires: gcc
%if 0%{?git_snapshot}
BuildRequires: automake
BuildRequires: libtool
%endif
%description
Oniguruma is a regular expressions library.
@ -58,30 +36,31 @@ developing applications that use %{name}.
%prep
%setup -q -n onig-%{mainver}%{?gitversion:-%{?gitversion}}
%setup -q -n onig-%{mainver}
%{__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
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
INSTALL="%{__install} -c -p"
find $RPM_BUILD_ROOT -name '*.la' \
-exec %{__rm} -f {} ';'
%check
%{__make} check
@ -123,62 +102,6 @@ autoreconf -fi
%{_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

View file

@ -1 +1 @@
SHA512 (onig-6.9.10.tar.gz) = f7cf33008ca0181322fb8efc8e6bb67a1f81677095a33d88134781b804e6a9fbf675f05789d762fdd3d9f0171f8dc4c2e960c2b6a09ddd03bfd35a5ab0920317
SHA512 (onig-6.9.7.1.tar.gz) = 17711e0d451c41e74cb3f8ab4e78b0181578ef42cb35dc64e87871c82a41909334cb4eeb03eccdccf6904f699e6e82b0dbb54077138225b9b95471fcdeb8c486