PR#2: Stop hiding the zlib-ng and libz-ng-sys features - rpms/rust-flate2

rpms / rust-flate2

#2 Stop hiding the zlib-ng and libz-ng-sys features

Merged 2 days ago by decathorpe. Opened 20 days ago by music.

rpms/ music/rust-flate2 zlib-ng into rawhide

Stop hiding the zlib-ng and libz-ng-sys features

Benjamin A. Beasley • 21 days ago

2d91321

flate2-fix-metadata-auto.diff

file modified

+1 -1

		`@@ -1,5 +1,5 @@`
		`--- flate2-1.0.28/Cargo.toml 1970-01-01T00:00:01+00:00`
		`- +++ flate2-1.0.28/Cargo.toml 2023-10-17T11:04:23.433000+00:00`
		`+ +++ flate2-1.0.28/Cargo.toml 2024-05-05T23:24:39.446043+00:00`
		`@@ -105,7 +105,3 @@`
		`"libz-sys/zlib-ng",`
		`]`

rust-flate2.spec

file modified

+25 -1

		`@@ -1,4 +1,4 @@`
		`- # Generated by rust2rpm 25`
		`+ # Generated by rust2rpm 26`
		`%bcond_without check`
		`%global debug_package %{nil}`

		`@@ -76,6 +76,18 @@`
		`%files -n %{name}+any_zlib-devel`
		`%ghost %{crate_instdir}/Cargo.toml`

		`+ %package -n %{name}+libz-ng-sys-devel`
		`+ Summary: %{summary}`
		`+ BuildArch: noarch`
		`+`
		`+ %description -n %{name}+libz-ng-sys-devel %{_description}`
		`+`
		`+ This package contains library source intended for building other packages which`
		`+ use the "libz-ng-sys" feature of the "%{crate}" crate.`
		`+`
		`+ %files -n %{name}+libz-ng-sys-devel`
		`+ %ghost %{crate_instdir}/Cargo.toml`
		`+`
		`%package -n %{name}+libz-sys-devel`
		`Summary: %{summary}`
		`BuildArch: noarch`
		`@@ -148,6 +160,18 @@`
		`%files -n %{name}+zlib-default-devel`
		`%ghost %{crate_instdir}/Cargo.toml`

		`+ %package -n %{name}+zlib-ng-devel`
		`+ Summary: %{summary}`
		`+ BuildArch: noarch`
		`+`
		`+ %description -n %{name}+zlib-ng-devel %{_description}`
		`+`
		`+ This package contains library source intended for building other packages which`
		`+ use the "zlib-ng" feature of the "%{crate}" crate.`
		`+`
		`+ %files -n %{name}+zlib-ng-devel`
		`+ %ghost %{crate_instdir}/Cargo.toml`
		`+`
		`%prep`
		`%autosetup -n %{crate}-%{version} -p1`
		`%cargo_prep`

rust2rpm.toml

file modified

-2

		`@@ -1,9 +1,7 @@`
		`[features]`
		`hide = [`
		`"cloudflare-zlib-sys",`
		`- "libz-ng-sys",`
		`"cloudflare_zlib",`
		`- "zlib-ng",`
		`"zlib-ng-compat",`
		`]`

music commented 20 days ago

Requires new package rust-libz-ng-sys (review request) – now in Rawhide.

music commented 9 days ago

Since https://src.fedoraproject.org/rpms/rust-zip/pull-request/1 builds with this PR, I believe we can have enough confidence in these crate features and in https://src.fedoraproject.org/rpms/rust-libz-ng-sys that this can be safely merged.

In https://src.fedoraproject.org/rpms/rust-libz-ng-sys, I requested branch for f40, f39, and epel9, merged rawhide into each, and pushed to dist-git, so that they are ready to be built into side tags (by anyone) along with this PR.

Let me go ahead and re-fire Fedora CI, since the installability check should be OK now.

Edited 9 days ago by music

music commented 9 days ago

Note that this doesn’t close https://bugzilla.redhat.com/show_bug.cgi?id=2253997. I didn‘t unhide the zlib-ng-compat feature, nor think about whether that was the right thing to do. (If it is, it would only be possible on F40+, because zlib-ng is not built with the compat interface elsewhere). The features enabled here link the “new” zlib-ng API, which is distinct from the zlib compat API. Programs could potentially link -lz and -lz-ng simultaneously.