commit fdc295bea5874ab100a6a94d7e559cba9a1ddcae Author: tigro Date: Mon Jan 15 22:00:21 2024 +0300 import rust-onig-6.4.0-2.el9 diff --git a/.rust-onig.metadata b/.rust-onig.metadata new file mode 100644 index 0000000..e69de29 diff --git a/SOURCES/onig-6.4.0.crate b/SOURCES/onig-6.4.0.crate new file mode 100644 index 0000000..47a5e16 Binary files /dev/null and b/SOURCES/onig-6.4.0.crate differ diff --git a/SOURCES/onig-696-compat.diff b/SOURCES/onig-696-compat.diff new file mode 100644 index 0000000..118b988 --- /dev/null +++ b/SOURCES/onig-696-compat.diff @@ -0,0 +1,43 @@ +--- a/src/flags.rs ++++ b/src/flags.rs +@@ -69,9 +69,6 @@ bitflags! { + /// `?` + const SYNTAX_OPERATOR_QMARK_ZERO_ONE + = (onig_sys::ONIG_SYN_OP_QMARK_ZERO_ONE as u64); +- /// ?P +- const SYNTAX_OPERATOR_QMARK_CAPITAL_P_NAME +- = (onig_sys::ONIG_SYN_OP2_QMARK_CAPITAL_P_NAME as u64); + /// `{lower,upper}` + const SYNTAX_OPERATOR_BRACE_INTERVAL + = (onig_sys::ONIG_SYN_OP_BRACE_INTERVAL as u64); +--- a/src/syntax.rs ++++ b/src/syntax.rs +@@ -33,10 +33,6 @@ pub struct Syntax { + } + + impl Syntax { +- /// Python syntax +- pub fn python() -> &'static Syntax { +- unsafe { transmute(&onig_sys::OnigSyntaxPython) } +- } + /// Plain text syntax + pub fn asis() -> &'static Syntax { + unsafe { transmute(&onig_sys::OnigSyntaxASIS) } +@@ -206,17 +202,3 @@ impl Syntax { + &self.raw as *const onig_sys::OnigSyntaxType as *mut onig_sys::OnigSyntaxType + } + } +- +-#[cfg(test)] +-mod test { +- use super::*; +- +- #[test] +- fn round_trip_bits() { +- let mut syn = Syntax::python().clone(); +- syn.enable_operators(SyntaxOperator::SYNTAX_OPERATOR_ESC_X_BRACE_HEX8); +- assert_ne!(Syntax::python().raw, syn.raw); +- syn.disable_operators(SyntaxOperator::SYNTAX_OPERATOR_ESC_X_BRACE_HEX8); +- assert_eq!(Syntax::python().raw, syn.raw); +- } +-} diff --git a/SOURCES/onig-fix-metadata-auto.diff b/SOURCES/onig-fix-metadata-auto.diff new file mode 100644 index 0000000..cf9bc35 --- /dev/null +++ b/SOURCES/onig-fix-metadata-auto.diff @@ -0,0 +1,8 @@ +--- onig-6.4.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ onig-6.4.0/Cargo.toml 1970-01-01T00:00:01+00:00 +@@ -45,5 +45,3 @@ + print-debug = ["onig_sys/print-debug"] + std-pattern = [] + +-[target."cfg(windows)".dependencies.libc] +-version = "0.2" diff --git a/SPECS/rust-onig.spec b/SPECS/rust-onig.spec new file mode 100644 index 0000000..42d1252 --- /dev/null +++ b/SPECS/rust-onig.spec @@ -0,0 +1,210 @@ +## START: Set by rpmautospec +## (rpmautospec version 0.3.0) +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 2; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +# Generated by rust2rpm 22 +%bcond_without check +%global debug_package %{nil} + +%global crate onig + +Name: rust-onig +Version: 6.4.0 +Release: %autorelease +Summary: Rust bindings for the Oniguruma regular expression library + +License: MIT +URL: https://crates.io/crates/onig +Source: %{crates_source} +# Automatically generated patch to strip foreign dependencies +Patch: onig-fix-metadata-auto.diff +# Restore compatibility with oniguruma 6.9.6 +Patch: onig-696-compat.diff + +ExclusiveArch: %{rust_arches} + +BuildRequires: rust-packaging >= 21 + +%global _description %{expand: +Rust-Onig is a set of Rust bindings for the Oniguruma regular expression +library. Oniguruma is a modern regex library with support for multiple +character encodings and regex syntaxes.} + +%description %{_description} + +%package devel +Summary: %{summary} +BuildArch: noarch + +%description devel %{_description} + +This package contains library source intended for building other packages which +use the "%{crate}" crate. + +%files devel +%license %{crate_instdir}/LICENSE.md +%doc %{crate_instdir}/README.md +%{crate_instdir}/ + +%package -n %{name}+default-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+default-devel %{_description} + +This package contains library source intended for building other packages which +use the "default" feature of the "%{crate}" crate. + +%files -n %{name}+default-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+generate-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+generate-devel %{_description} + +This package contains library source intended for building other packages which +use the "generate" feature of the "%{crate}" crate. + +%files -n %{name}+generate-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+posix-api-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+posix-api-devel %{_description} + +This package contains library source intended for building other packages which +use the "posix-api" feature of the "%{crate}" crate. + +%files -n %{name}+posix-api-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+print-debug-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+print-debug-devel %{_description} + +This package contains library source intended for building other packages which +use the "print-debug" feature of the "%{crate}" crate. + +%files -n %{name}+print-debug-devel +%ghost %{crate_instdir}/Cargo.toml + +%package -n %{name}+std-pattern-devel +Summary: %{summary} +BuildArch: noarch + +%description -n %{name}+std-pattern-devel %{_description} + +This package contains library source intended for building other packages which +use the "std-pattern" feature of the "%{crate}" crate. + +%files -n %{name}+std-pattern-devel +%ghost %{crate_instdir}/Cargo.toml + +%prep +%autosetup -n %{crate}-%{version_no_tilde} -p1 +%cargo_prep + +%generate_buildrequires +%cargo_generate_buildrequires + +%build +%cargo_build + +%install +%cargo_install + +%if %{with check} +%check +%cargo_test +%endif + +%changelog +* Mon Jan 15 2024 Arkady L. Shane - 6.4.0-2 +- Rebuilt for MSVSphere 9.3 + +* Tue Dec 13 2022 Michel Alexandre Salim 6.4.0-2 +- Restore compatibility with oniguruma 6.9.6 + +* Sat Aug 20 2022 Fabio Valentini 6.4.0-1 +- Update to version 6.4.0; Fixes RHBZ#2116721 + +* Mon Aug 08 2022 Fabio Valentini 6.3.2-1 +- Update to version 6.3.2; Fixes RHBZ#1970079 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 6.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Nov 29 2020 Fabio Valentini - 6.1.1-1 +- Update to version 6.1.1. + +* Wed Sep 23 2020 Fabio Valentini - 6.1.0-1 +- Update to version 6.1.0. + +* Wed Jul 29 2020 Fedora Release Engineering - 6.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat May 23 21:23:13 CEST 2020 Igor Raits - 6.0.0-1 +- Update to 6.0.0 + +* Thu Jan 30 2020 Fedora Release Engineering - 5.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Sep 05 05:32:36 CEST 2019 Igor Gnatenko - 5.0.0-1 +- Update to 5.0.0 + +* Fri Jul 26 2019 Fedora Release Engineering - 4.3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Jun 23 00:26:45 CEST 2019 Igor Gnatenko - 4.3.2-4 +- Re-enable tests + +* Sat Jun 22 23:30:17 CEST 2019 Igor Gnatenko - 4.3.2-3 +- Regenerate + +* Sun Mar 10 2019 Igor Gnatenko - 4.3.2-2 +- Do not pull optional dependencies + +* Sun Feb 10 2019 Igor Gnatenko - 4.3.2-1 +- Update to 4.3.2 + +* Sat Feb 02 2019 Fedora Release Engineering - 4.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 16 2019 Josh Stone - 4.3.1-1 +- Update to 4.3.1 + +* Sat Jan 12 2019 Igor Gnatenko - 4.3.0-1 +- Update to 4.3.0 + +* Tue Nov 13 2018 Josh Stone - 4.2.1-1 +- Update to 4.2.1 + +* Sat Nov 03 2018 Igor Gnatenko - 4.2.0-2 +- Adapt to new packaging + +* Sat Sep 08 2018 Igor Gnatenko - 4.2.0-1 +- Update to 4.2.0 + +* Mon Sep 03 2018 Igor Gnatenko - 4.1.0-1 +- Initial package +