From 0a8605a34d29b67c8b298fb3fe4c6bd11669bf38 Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Sat, 13 Jul 2024 14:49:37 -0700 Subject: [PATCH] fix: oxipng (#1520) (#1527) (cherry picked from commit 1aaacb5410fbc8102ff8f29b42b4ee700d0ecf86) Co-authored-by: madomado --- .../rust/oxipng/oxipng-fix-metadata-auto.diff | 18 ++--- anda/langs/rust/oxipng/rust-oxipng.spec | 66 ++----------------- 2 files changed, 13 insertions(+), 71 deletions(-) diff --git a/anda/langs/rust/oxipng/oxipng-fix-metadata-auto.diff b/anda/langs/rust/oxipng/oxipng-fix-metadata-auto.diff index e4fde1a2c2..5e4fb32163 100644 --- a/anda/langs/rust/oxipng/oxipng-fix-metadata-auto.diff +++ b/anda/langs/rust/oxipng/oxipng-fix-metadata-auto.diff @@ -1,16 +1,16 @@ ---- oxipng-9.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ oxipng-9.0.0/Cargo.toml 2023-10-30T06:36:01.294365+00:00 -@@ -116,7 +116,6 @@ +--- oxipng-9.1.2/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ oxipng-9.1.2/Cargo.toml 2024-07-13T07:08:09.478330+00:00 +@@ -150,7 +150,6 @@ [features] binary = [ - "clap", -- "glob", - "env_logger", + "dep:clap", +- "dep:glob", + "dep:env_logger", ] default = [ -@@ -133,13 +132,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/anda/langs/rust/oxipng/rust-oxipng.spec b/anda/langs/rust/oxipng/rust-oxipng.spec index f66dbf2340..aaa8bf1f3d 100644 --- a/anda/langs/rust/oxipng/rust-oxipng.spec +++ b/anda/langs/rust/oxipng/rust-oxipng.spec @@ -1,11 +1,13 @@ -# Generated by rust2rpm 25 +# Generated by rust2rpm 26 %bcond_without check +# don't mangle shebangs +%global __brp_mangle_shebangs %{nil} %global crate oxipng Name: rust-oxipng Version: 9.1.2 -Release: 1%?dist +Release: %autorelease Summary: Lossless PNG compression optimizer License: MIT @@ -77,42 +79,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 @@ -137,18 +103,6 @@ use the "freestanding" feature of the "%{crate}" crate. %files -n %{name}+freestanding-devel %ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+image-devel -Summary: %{summary} -BuildArch: noarch - -%description -n %{name}+image-devel %{_description} - -This package contains library source intended for building other packages which -use the "image" feature of the "%{crate}" crate. - -%files -n %{name}+image-devel -%ghost %{crate_instdir}/Cargo.toml - %package -n %{name}+parallel-devel Summary: %{summary} BuildArch: noarch @@ -161,18 +115,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}+sanity-checks-devel Summary: %{summary} BuildArch: noarch