README.md

@@ -0,0 +1,3 @@
+# rust-onig_sys
+
+The rust-onig_sys package

onig_sys-fix-metadata.diff

@@ -1,23 +1,17 @@
 --- onig_sys-69.8.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ onig_sys-69.8.1/Cargo.toml	2024-10-23T17:18:50.214423+00:00
++++ onig_sys-69.8.1/Cargo.toml	2023-04-12T12:14:30.588379+00:00
-@@ -29,15 +29,13 @@
+@@ -35,9 +35,8 @@
- instead check out the `onig` crate.
- """
- documentation = "http://rust-onig.github.io/rust-onig/onig_sys/"
--readme = "README.md"
- categories = ["external-ffi-bindings"]
- license = "MIT"
  repository = "http://github.com/iwillspeak/rust-onig"
  
  [build-dependencies.bindgen]
 -version = "0.59"
-+version = "0.69"
++version = "0.63"
  features = ["runtime"]
 -optional = true
  
  [build-dependencies.cc]
  version = "1.0"
-@@ -46,6 +44,7 @@
+@@ -46,6 +45,7 @@
  version = "^0.3.16"
  
  [features]

rust-onig_sys.spec

@@ -1,4 +1,4 @@
-# Generated by rust2rpm 26
+# Generated by rust2rpm 24
 %bcond_without check
 %global debug_package %{nil}
 
@@ -13,14 +13,12 @@ License:        MIT
 URL:            https://crates.io/crates/onig_sys
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
-# * bump bindgen build-dependency from 0.59 to 0.69
+# * bump bindgen build-dependency from 0.59 to 0.63
-# * remove reference to readme file that is not included in published crates
 Patch:          onig_sys-fix-metadata.diff
 # * unconditionally use bindgen and dynamic linking with pkg-config
-Patch1:         0001-Unconditionally-use-bindgen-and-dynamic-linking-with.patch
+Patch:          0001-Unconditionally-use-bindgen-and-dynamic-linking-with.patch
 
-BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  rust-packaging >= 21
-BuildRequires:  pkgconfig(oniguruma) >= 6.8.0
 
 %global _description %{expand:
 The `onig_sys` crate contains raw rust bindings to the oniguruma
@@ -106,13 +104,14 @@ use the "print-debug" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
-%cargo_prep
 # remove bundled oniguruma sources
 rm -r oniguruma/
+%cargo_prep
 
 %generate_buildrequires
 %cargo_generate_buildrequires
+echo 'pkgconfig(oniguruma) >= 6.8.0'
 
 %build
 %cargo_build

rust2rpm.conf

@@ -0,0 +1,5 @@
+[DEFAULT]
+buildrequires =
+  pkgconfig(oniguruma) >= 6.8.0
+lib.requires =
+  pkgconfig(oniguruma) >= 6.8.0

rust2rpm.toml

@@ -1,26 +0,0 @@
-[package]
-summary = "Rust bindings for oniguruma"
-cargo-toml-patch-comments = [
-    "bump bindgen build-dependency from 0.59 to 0.69",
-    "remove reference to readme file that is not included in published crates",
-]
-
-[[package.extra-patches]]
-number = 1
-file = "0001-Unconditionally-use-bindgen-and-dynamic-linking-with.patch"
-comments = ["unconditionally use bindgen and dynamic linking with pkg-config"]
-
-[requires]
-build = [
-    "pkgconfig(oniguruma) >= 6.8.0",
-]
-lib = [
-    "pkgconfig(oniguruma) >= 6.8.0",
-]
-
-[scripts]
-prep.post = [
-    "# remove bundled oniguruma sources",
-    "rm -r oniguruma/",
-]
-