Update to 0.8.0 (close RHBZ#2259758)

- Patch out the zopfli binary, which conflicts with the one provided by
  the zopfli package

Signed-off-by: Benjamin A. Beasley <code@musicinmybrain.net>

.gitignore

@@ -1,2 +1,3 @@
 /zopfli-0.4.0.crate
 /zopfli-0.5.0.crate
+/zopfli-0.8.0.crate

rust-zopfli.spec

@@ -1,58 +1,45 @@
-# Generated by rust2rpm 20
+# Generated by rust2rpm 25
 %bcond_without check
+%global debug_package %{nil}
 
 %global crate zopfli
 
-Name:           rust-%{crate}
+Name:           rust-zopfli
-Version:        0.5.0
+Version:        0.8.0
 Release:        %autorelease
-Summary:        Rust implementation of a compression algorithm
+Summary:        Rust implementation of the Zopfli compression algorithm
 
-# Upstream license specification: Apache-2.0
+License:        Apache-2.0
-License:        ASL 2.0
 URL:            https://crates.io/crates/zopfli
 Source:         %{crates_source}
-# Initial patched metadata
+# Manually created patch for downstream crate metadata changes
-# Downgrade typed-arena to version 1.7
+#
-Patch0:         zopfli-fix-metadata.diff
+# - Don’t build the “zopfli” executable, which would conflict with the more
+#   widely used one provided by https://src.fedoraproject.org/rpms/zopfli.
+Patch:          zopfli-fix-metadata.diff
 
-ExclusiveArch:  %{rust_arches}
+BuildRequires:  cargo-rpm-macros >= 24
-
-BuildRequires:  rust-packaging
 
 %global _description %{expand:
-Rust implementation of the Zopfli compression algorithm.}
+A Rust implementation of the Zopfli compression algorithm.}
 
 %description %{_description}
 
-%package     -n %{crate}
-Summary:        %{summary}
-# MIT
-# MIT or ASL 2.0
-# Unlicense or MIT
-# zlib
-License:        MIT and ASL 2.0 and Unlicense and zlib
-
-%description -n %{crate} %{_description}
-
-%files       -n %{crate}
-%license COPYING
-%doc CONTRIBUTING.md CONTRIBUTORS README.md
-%{_bindir}/zopfli
-
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
 %description    devel %{_description}
 
-This package contains library source intended for building other packages
+This package contains library source intended for building other packages which
-which use "%{crate}" crate.
+use the "%{crate}" crate.
 
 %files          devel
-%license COPYING
+%license %{crate_instdir}/COPYING
-%doc CONTRIBUTING.md CONTRIBUTORS README.md
+%doc %{crate_instdir}/CONTRIBUTING.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
+%doc %{crate_instdir}/CONTRIBUTORS
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
 
 %package     -n %{name}+default-devel
 Summary:        %{summary}
@@ -61,13 +48,49 @@ 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}+gzip-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+gzip-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "gzip" feature of the "%{crate}" crate.
+
+%files       -n %{name}+gzip-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+std-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+std-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "std" feature of the "%{crate}" crate.
+
+%files       -n %{name}+std-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+zlib-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+zlib-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "zlib" feature of the "%{crate}" crate.
+
+%files       -n %{name}+zlib-devel
+%ghost %{crate_instdir}/Cargo.toml
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version} -p1
 %cargo_prep
 
 %generate_buildrequires

rust2rpm.toml

@@ -0,0 +1,4 @@
+[features]
+hide = [
+  "nightly"
+]

sources

@@ -1 +1 @@
-SHA512 (zopfli-0.5.0.crate) = f8ea69c3aea08a53851e177e3579c46076271d28f6fe2da55ebd46a5f6d918afd084c0dc372313f4a06798ceb35adb577ce30bf272f273b842ba95172be3c9ec
+SHA512 (zopfli-0.8.0.crate) = 3b788f0ca94a106ce690764d081bf277eddb364b07287c33be3855fdc63bd583b5e8aac95b709833b4ec4a8f153e7e1ea822b09da23d5db777137bc1dd49e17c

zopfli-fix-metadata.diff

@@ -1,8 +1,24 @@
---- zopfli-0.5.0/Cargo.toml	1970-01-01T00:00:01+00:00
+--- zopfli-0.8.0/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ zopfli-0.5.0/Cargo.toml	2022-01-17T22:21:57.128813+00:00
++++ zopfli-0.8.0/Cargo.toml	2024-01-22T17:28:52.493168+00:00
-@@ -35,4 +35,4 @@
+@@ -25,20 +25,13 @@
- version = "2"
+ ]
+ license = "Apache-2.0"
+ repository = "https://github.com/zopfli-rs/zopfli"
++autobins = false
  
- [dependencies.typed-arena]
+ [package.metadata.docs.rs]
--version = "2"
+ cargo-args = ["--all-features"]
-+version = "1.7"
+ 
+ [profile.release]
+ debug = 2
+-
+-[[bin]]
+-name = "zopfli"
+-required-features = [
+-    "std",
+-    "gzip",
+-    "zlib",
+-]
+ 
+ [dependencies.crc32fast]
+ version = "1.3.2"