diff --git a/.gitignore b/.gitignore index 3c47fc1..a61989f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /oxipng-4.0.3.crate /oxipng-5.0.0.crate /oxipng-5.0.1.crate +/oxipng-9.0.0.crate diff --git a/oxipng-fix-metadata-auto.diff b/oxipng-fix-metadata-auto.diff new file mode 100644 index 0000000..081c7b8 --- /dev/null +++ b/oxipng-fix-metadata-auto.diff @@ -0,0 +1,25 @@ +--- oxipng-9.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ oxipng-9.0.0/Cargo.toml 2024-02-17T11:43:41.461531+00:00 +@@ -116,7 +116,6 @@ + [features] + binary = [ + "clap", +- "glob", + "env_logger", + ] + default = [ +@@ -133,13 +132,10 @@ + ] + sanity-checks = ["image"] + +-[target."cfg(windows)".dependencies.glob] +-version = "0.3.1" +-optional = true +- + [badges.maintenance] + status = "actively-developed" + + [badges.travis-ci] + branch = "master" + repository = "shssoichiro/oxipng" ++ diff --git a/oxipng-fix-metadata.diff b/oxipng-fix-metadata.diff index 117b68b..4e62b30 100644 --- a/oxipng-fix-metadata.diff +++ b/oxipng-fix-metadata.diff @@ -1,20 +1,19 @@ ---- oxipng-5.0.1/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ oxipng-5.0.1/Cargo.toml 2022-01-17T23:31:54.908377+00:00 -@@ -78,7 +78,7 @@ - version = "0.4.14" - - [dependencies.miniz_oxide] --version = "0.5" -+version = "0.4" - - [dependencies.rayon] - version = "^1.5.0" -@@ -96,7 +96,7 @@ - optional = true - - [dependencies.zopfli] --version = "^0.4.0" -+version = "^0.5.0" - optional = true - [build-dependencies.rustc_version] - version = "0.4" +--- oxipng-9.0.0/Cargo.toml 1970-01-01T00:00:01+00:00 ++++ oxipng-9.0.0/Cargo.toml 2024-02-17T11:45:14.377789+00:00 +@@ -16,8 +16,15 @@ + version = "9.0.0" + authors = ["Joshua Holmer "] + exclude = [ ++ ".editorconfig", ++ ".gitattributes", ++ ".github/*", ++ ".gitignore", ++ ".pre-commit-hooks.yaml", ++ "Dockerfile", ++ "index.html", ++ "scripts/*", + "tests/*", +- "bench/*", + ] + description = "A lossless PNG compression optimizer" + homepage = "https://github.com/shssoichiro/oxipng" diff --git a/rust-oxipng.spec b/rust-oxipng.spec index e08e3d3..5a3878e 100644 --- a/rust-oxipng.spec +++ b/rust-oxipng.spec @@ -1,51 +1,57 @@ -# Generated by rust2rpm 20 +# Generated by rust2rpm 25 %bcond_without check %global crate oxipng -Name: rust-%{crate} -Version: 5.0.1 +Name: rust-oxipng +Version: 9.0.0 Release: %autorelease Summary: Lossless PNG compression optimizer -# Upstream license specification: MIT License: MIT URL: https://crates.io/crates/oxipng Source: %{crates_source} -# Initial patched metadata -# Downgrade miniz_oxide to version 0.4 -# Upgrade zopfli to version 0.5 -Patch0: oxipng-fix-metadata.diff +# Automatically generated patch to strip dependencies and normalize metadata +Patch: oxipng-fix-metadata-auto.diff +# Manually created patch for downstream crate metadata changes +# - Omit unnecessary files from the crate, as in “Exclude more files from the +# published crate” https://github.com/shssoichiro/oxipng/pull/591 +Patch: oxipng-fix-metadata.diff -ExclusiveArch: %{rust_arches} - -BuildRequires: rust-packaging +BuildRequires: cargo-rpm-macros >= 24 %global _description %{expand: -Lossless PNG compression optimizer.} +A lossless PNG compression optimizer.} %description %{_description} %package -n %{crate} Summary: %{summary} -# 0BSD or MIT or ASL 2.0 -# ASL 2.0 -# ASL 2.0 and MIT -# ASL 2.0 or MIT +# Apache-2.0 +# Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT # MIT -# MIT and zlib or ASL 2.0 and zlib -# MIT or ASL 2.0 -# MIT or zlib or ASL 2.0 -# Unlicense or MIT -# zlib -# zlib or ASL 2.0 or MIT -License: ASL 2.0 and MIT and zlib +# MIT OR Apache-2.0 +# Unlicense OR MIT +# Zlib OR Apache-2.0 OR MIT +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 + MIT AND + (Unlicense OR MIT) AND + (Zlib OR Apache-2.0 OR MIT) + } +# LICENSE.dependencies contains a full license breakdown %description -n %{crate} %{_description} %files -n %{crate} %license LICENSE -%doc CHANGELOG.md README.md README.template.md +%license LICENSE.dependencies +%doc CHANGELOG.md +%doc MANUAL.txt +%doc README.md %{_bindir}/oxipng %package devel @@ -55,12 +61,14 @@ BuildArch: noarch %description devel %{_description} This package contains library source intended for building other packages which -use "%{crate}" crate. +use the "%{crate}" crate. %files devel -%license LICENSE -%doc CHANGELOG.md README.md README.template.md -%{cargo_registry}/%{crate}-%{version_no_tilde}/ +%license %{crate_instdir}/LICENSE +%doc %{crate_instdir}/CHANGELOG.md +%doc %{crate_instdir}/MANUAL.txt +%doc %{crate_instdir}/README.md +%{crate_instdir}/ %package -n %{name}+default-devel Summary: %{summary} @@ -69,10 +77,10 @@ BuildArch: noarch %description -n %{name}+default-devel %{_description} This package contains library source intended for building other packages which -use "default" feature of "%{crate}" crate. +use the "default" feature of the "%{crate}" crate. %files -n %{name}+default-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+binary-devel Summary: %{summary} @@ -81,10 +89,10 @@ BuildArch: noarch %description -n %{name}+binary-devel %{_description} This package contains library source intended for building other packages which -use "binary" feature of "%{crate}" crate. +use the "binary" feature of the "%{crate}" crate. %files -n %{name}+binary-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+clap-devel Summary: %{summary} @@ -93,10 +101,34 @@ BuildArch: noarch %description -n %{name}+clap-devel %{_description} This package contains library source intended for building other packages which -use "clap" feature of "%{crate}" crate. +use the "clap" feature of the "%{crate}" crate. %files -n %{name}+clap-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%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} @@ -105,70 +137,70 @@ BuildArch: noarch %description -n %{name}+filetime-devel %{_description} This package contains library source intended for building other packages which -use "filetime" feature of "%{crate}" crate. +use the "filetime" feature of the "%{crate}" crate. %files -n %{name}+filetime-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+libdeflater-devel +%package -n %{name}+freestanding-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+libdeflater-devel %{_description} +%description -n %{name}+freestanding-devel %{_description} This package contains library source intended for building other packages which -use "libdeflater" feature of "%{crate}" crate. +use the "freestanding" feature of the "%{crate}" crate. -%files -n %{name}+libdeflater-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+freestanding-devel +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+parallel-devel +%package -n %{name}+image-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+parallel-devel %{_description} +%description -n %{name}+image-devel %{_description} This package contains library source intended for building other packages which -use "parallel" feature of "%{crate}" crate. +use the "image" feature of the "%{crate}" crate. -%files -n %{name}+parallel-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+image-devel +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+rayon-devel +%package -n %{name}+parallel-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+rayon-devel %{_description} +%description -n %{name}+parallel-devel %{_description} This package contains library source intended for building other packages which -use "rayon" feature of "%{crate}" crate. +use the "parallel" feature of the "%{crate}" crate. -%files -n %{name}+rayon-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+parallel-devel +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+stderrlog-devel +%package -n %{name}+rayon-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+stderrlog-devel %{_description} +%description -n %{name}+rayon-devel %{_description} -This package contains library source intended for building other packages which -use "stderrlog" feature of "%{crate}" crate. +This package contains library source intended for building other packages which +use the "rayon" feature of the "%{crate}" crate. -%files -n %{name}+stderrlog-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+rayon-devel +%ghost %{crate_instdir}/Cargo.toml -%package -n %{name}+wild-devel +%package -n %{name}+sanity-checks-devel Summary: %{summary} BuildArch: noarch -%description -n %{name}+wild-devel %{_description} +%description -n %{name}+sanity-checks-devel %{_description} This package contains library source intended for building other packages which -use "wild" feature of "%{crate}" crate. +use the "sanity-checks" feature of the "%{crate}" crate. -%files -n %{name}+wild-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%files -n %{name}+sanity-checks-devel +%ghost %{crate_instdir}/Cargo.toml %package -n %{name}+zopfli-devel Summary: %{summary} @@ -177,13 +209,13 @@ BuildArch: noarch %description -n %{name}+zopfli-devel %{_description} This package contains library source intended for building other packages which -use "zopfli" feature of "%{crate}" crate. +use the "zopfli" feature of the "%{crate}" crate. %files -n %{name}+zopfli-devel -%ghost %{cargo_registry}/%{crate}-%{version_no_tilde}/Cargo.toml +%ghost %{crate_instdir}/Cargo.toml %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 +%autosetup -n %{crate}-%{version} -p1 %cargo_prep %generate_buildrequires @@ -191,6 +223,8 @@ use "zopfli" feature of "%{crate}" crate. %build %cargo_build +%{cargo_license_summary} +%{cargo_license} > LICENSE.dependencies %install %cargo_install diff --git a/sources b/sources index 2eee8b6..a0dcda7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (oxipng-5.0.1.crate) = ab3568647fc6b0c9f30cb3e08bce0648a67ae8b924fe0909c8088477d25221bf500535c1d69c896be7622ca3e40da65f4fad5970af42d9b29e33fdfc33ccb84a +SHA512 (oxipng-9.0.0.crate) = 42ec6c4abfce4a12feef9f43e3945c9dd822079eb434fd24c6dedb26fa3c1d962c462b1f3b5dbedcc53dc311b9ee018270986e0ca080e4249af02f8152338fd4