[rpms/rust-freetype-sys] epel10: Update to version 0.20.0; Fixes RHBZ#2238393

[rpms/rust-freetype-sys] epel10: Update to version 0.20.0; Fixes RHBZ#2238393

[Fabio Valentini]

A new commit has been pushed.

Repo   : rpms/rust-freetype-sys
Branch : epel10
Commit : 02ddc6e89cb5f6995c96d32bfdf1664c196179b9
Author : Fabio Valentini <decathorpe@gmail.com>
Date   : 2024-03-26T23:36:43+01:00
Stats  : +18/-76 in 7 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-freetype-sys/c/02ddc6e89cb5f6995c96d32bfdf1664c196179b9?branch=epel10

Log:
Update to version 0.20.0; Fixes RHBZ#2238393

---
diff --git a/.gitignore b/.gitignore
index a0cdc07..47266cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /freetype-sys-0.13.1.crate
 /freetype-sys-0.16.0.crate
 /freetype-sys-0.17.0.crate
+/freetype-sys-0.20.0.crate

diff --git a/109.patch b/109.patch
deleted file mode 100644
index b5d28e8..0000000
--- a/109.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ece8a60f10ae4cdc96af0a795498bb89522f1d07 Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe@gmail.com>
-Date: Wed, 1 Mar 2023 16:57:46 +0100
-Subject: [PATCH] Restore pkg-config / dynamic linking support
-
----
- Cargo.toml.orig |  1 +
- build.rs        | 12 ++++++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git a/Cargo.toml.orig b/Cargo.toml.orig
-index 0e6918a..4ae5606 100644
---- a/Cargo.toml.orig
-+++ b/Cargo.toml.orig
-@@ -14,6 +14,7 @@ homepage = "https://github.com/PistonDevelopers/freetype-sys"
- 
- [build-dependencies]
- cc = "1"
-+pkg-config = "0.3.11"
- 
- [dependencies]
- libc = "0.2.42"
-diff --git a/build.rs b/build.rs
-index e16a9f7..5a5a39a 100644
---- a/build.rs
-+++ b/build.rs
-@@ -1,3 +1,5 @@
-+use std::env;
-+
- fn add_sources(build: &mut cc::Build, root: &str, files: &[&str]) {
-     let root = std::path::Path::new(root);
-     build.files(files.iter().map(|src| {
-@@ -10,6 +12,16 @@ fn add_sources(build: &mut cc::Build, root: &str, files: &[&str]) {
- }
- 
- fn main() {
-+    let target = env::var("TARGET").unwrap();
-+    if !target.contains("android")
-+        && pkg_config::Config::new()
-+            .atleast_version("24.3.18")
-+            .find("freetype2")
-+            .is_ok()
-+    {
-+        return;
-+    }
-+
-     let mut build = cc::Build::new();
- 
-     build

diff --git a/freetype-sys-fix-metadata.diff b/freetype-sys-fix-metadata.diff
deleted file mode 100644
index c51852d..0000000
--- a/freetype-sys-fix-metadata.diff
+++ /dev/null
@@ -1,9 +0,0 @@
---- freetype-sys-0.17.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ freetype-sys-0.17.0/Cargo.toml	2023-03-01T16:07:49.054718+00:00
-@@ -30,3 +30,6 @@
- 
- [build-dependencies.cc]
- version = "1"
-+
-+[build-dependencies.pkg-config]
-+version = "0.3.11"

diff --git a/rust-freetype-sys.spec b/rust-freetype-sys.spec
index 2248996..9318732 100644
--- a/rust-freetype-sys.spec
+++ b/rust-freetype-sys.spec
@@ -1,25 +1,19 @@
-# Generated by rust2rpm 24
+# Generated by rust2rpm 26
 %bcond_without check
 %global debug_package %{nil}
 
 %global crate freetype-sys
 
 Name:           rust-freetype-sys
-Version:        0.17.0
+Version:        0.20.0
 Release:        %autorelease
 Summary:        Low level binding for FreeType font library
 
 License:        MIT
 URL:            https://crates.io/crates/freetype-sys
 Source:         %{crates_source}
-# Manually created patch for downstream crate metadata changes
-# * add pkg-config build-dependency
-Patch:          freetype-sys-fix-metadata.diff
-# * patch to restore support for dynamically linking with system libfreetype:
-#   https://github.com/PistonDevelopers/freetype-sys/pull/109
-Patch:          109.patch
 
-BuildRequires:  rust-packaging >= 21
+BuildRequires:  cargo-rpm-macros >= 24
 
 %global _description %{expand:
 Low level binding for FreeType font library.}
@@ -54,10 +48,10 @@ use the "default" feature of the "%{crate}" crate.
 %ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
-# remove the bundled copy to make sure we're linking against the system lib
-rm -vr freetype2
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
+# remove bundled copy of freetype2
+rm -vr freetype2
 
 %generate_buildrequires
 %cargo_generate_buildrequires

diff --git a/rust2rpm.conf b/rust2rpm.conf
deleted file mode 100644
index ed95ae5..0000000
--- a/rust2rpm.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-[DEFAULT]
-buildrequires =
-  pkgconfig(freetype2) >= 24.3.18
-lib.requires =
-  pkgconfig(freetype2) >= 24.3.18

diff --git a/rust2rpm.toml b/rust2rpm.toml
new file mode 100644
index 0000000..9452830
--- /dev/null
+++ b/rust2rpm.toml
@@ -0,0 +1,10 @@
+[requires]
+build = ["pkgconfig(freetype2) >= 24.3.18"]
+lib = ["pkgconfig(freetype2) >= 24.3.18"]
+
+[scripts]
+prep.post = [
+    "# remove bundled copy of freetype2",
+    "rm -vr freetype2",
+]
+

diff --git a/sources b/sources
index 2a22cd4..5dc50bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (freetype-sys-0.17.0.crate) = 6b26cbba311ab9bad368313075543e649d1826ec8da0fa0e35ff505e43b0ed6e52c6fbb66b56283dfb1dc872fc5dc47abd3642abaa58aba14db9a329037f13cf
+SHA512 (freetype-sys-0.20.0.crate) = 7918cd05e541220bea9e8a5ee28f4bdd3381218747d7751cd609e82c241ef92a436ff1aee642fcf202e8418ac0f593d7be67c216ebdf63da15cbe3fd19174c30