From 6fec9e08d6c10f6860d96a4161b6b6ba078c6cb0 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 15 Jul 2024 16:26:40 -0400
Subject: [PATCH] Update to 9.1.2 (close RHBZ#2297884)

---
 .gitignore                    |  1 +
 oxipng-fix-metadata-auto.diff | 16 +++++------
 rust-oxipng.spec              | 52 ++---------------------------------
 rust2rpm.toml                 |  4 +--
 sources                       |  2 +-
 5 files changed, 14 insertions(+), 61 deletions(-)

diff --git a/.gitignore b/.gitignore
index 49077f1..e4d81ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /oxipng-5.0.1.crate
 /oxipng-9.0.0.crate
 /oxipng-9.1.1.crate
+/oxipng-9.1.2.crate
diff --git a/oxipng-fix-metadata-auto.diff b/oxipng-fix-metadata-auto.diff
index 63747d0..6063a77 100644
--- a/oxipng-fix-metadata-auto.diff
+++ b/oxipng-fix-metadata-auto.diff
@@ -1,16 +1,16 @@
---- oxipng-9.1.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ oxipng-9.1.1/Cargo.toml	2024-04-26T21:18:32.492352+00:00
+--- oxipng-9.1.2/Cargo.toml	1970-01-01T00:00:01+00:00
++++ oxipng-9.1.2/Cargo.toml	2024-07-15T20:25:45.717484+00:00
 @@ -150,7 +150,6 @@
  [features]
  binary = [
-     "clap",
--    "glob",
-     "env_logger",
+     "dep:clap",
+-    "dep:glob",
+     "dep:env_logger",
  ]
  default = [
-@@ -167,13 +166,10 @@
- ]
- sanity-checks = ["image"]
+@@ -169,13 +168,10 @@
+ sanity-checks = ["dep:image"]
+ zopfli = ["dep:zopfli"]
  
 -[target."cfg(windows)".dependencies.glob]
 -version = "0.3.1"
diff --git a/rust-oxipng.spec b/rust-oxipng.spec
index 2bc4bf0..58c2cf2 100644
--- a/rust-oxipng.spec
+++ b/rust-oxipng.spec
@@ -4,7 +4,7 @@
 %global crate oxipng
 
 Name:           rust-oxipng
-Version:        9.1.1
+Version:        9.1.2
 Release:        %autorelease
 Summary:        Lossless PNG compression optimizer
 
@@ -26,6 +26,7 @@ Summary:        %{summary}
 # Apache-2.0
 # Apache-2.0 OR MIT
 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
+# BSL-1.0
 # MIT
 # MIT OR Apache-2.0 (duplicate)
 # Zlib OR Apache-2.0 OR MIT
@@ -33,6 +34,7 @@ License:        %{shrink:
                 Apache-2.0 AND
                 (Apache-2.0 OR MIT) AND
                 (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND
+                BSL-1.0 AND
                 MIT AND
                 (Zlib OR Apache-2.0 OR MIT)
                 }
@@ -89,42 +91,6 @@ use the "binary" feature of the "%{crate}" crate.
 %files       -n %{name}+binary-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+clap-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+clap-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "clap" feature of the "%{crate}" crate.
-
-%files       -n %{name}+clap-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+crossbeam-channel-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+crossbeam-channel-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "crossbeam-channel" feature of the "%{crate}" crate.
-
-%files       -n %{name}+crossbeam-channel-devel
-%ghost %{crate_instdir}/Cargo.toml
-
-%package     -n %{name}+env_logger-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+env_logger-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "env_logger" feature of the "%{crate}" crate.
-
-%files       -n %{name}+env_logger-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+filetime-devel
 Summary:        %{summary}
 BuildArch:      noarch
@@ -161,18 +127,6 @@ use the "parallel" feature of the "%{crate}" crate.
 %files       -n %{name}+parallel-devel
 %ghost %{crate_instdir}/Cargo.toml
 
-%package     -n %{name}+rayon-devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description -n %{name}+rayon-devel %{_description}
-
-This package contains library source intended for building other packages which
-use the "rayon" feature of the "%{crate}" crate.
-
-%files       -n %{name}+rayon-devel
-%ghost %{crate_instdir}/Cargo.toml
-
 %package     -n %{name}+zopfli-devel
 Summary:        %{summary}
 BuildArch:      noarch
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 4d094db..a60c3d2 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -12,9 +12,7 @@ post = [
 
 [features]
 hide = [
-  # Waiting for rust-image 0.25.1:
+  # Needs "dep:image"; waiting for rust-image 0.25.1:
   # https://bugzilla.redhat.com/show_bug.cgi?id=2268816
-  "image",
-  # Needs the image feature:
   "sanity-checks",
 ]
diff --git a/sources b/sources
index aeb7486..f98f1f1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (oxipng-9.1.1.crate) = 067c6a02523bed7dae44df8aba7fddd4989f2c841c6addb9f237f756ad1dc21a7cbf7abb76539b4a3e759f7c63cc33273dff7519a6301f4f0c78c66502f0d372
+SHA512 (oxipng-9.1.2.crate) = 23bba0a62add3c8224845c9d01d8414f2f8b27a694d50b23e048722a4562b0c39e88f8db5b42c9020563383e761816f1cb7188d9cfafad88c75131adaad96ae0