public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Benjamin A. Beasley <code@musicinmybrain.net>
To: git-commits@fedoraproject.org
Subject: [rpms/rust-ureq] rawhide: Re-enable the brotli feature
Date: Wed, 01 Jul 2026 10:45:47 GMT	[thread overview]
Message-ID: <178290274773.1.3464427822940611980.rpms-rust-ureq-0735049809eb@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/rust-ureq
Branch : rawhide
Commit : 0735049809eb9deee082463689eda42b54a7d67f
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-06-28T07:58:15+01:00
Stats  : +25/-22 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/rust-ureq/c/0735049809eb9deee082463689eda42b54a7d67f?branch=rawhide

Log:
Re-enable the brotli feature

---
diff --git a/rust-ureq.spec b/rust-ureq.spec
index 3ade2b6..bdef838 100644
--- a/rust-ureq.spec
+++ b/rust-ureq.spec
@@ -13,10 +13,10 @@ License:        MIT OR Apache-2.0
 URL:            https://crates.io/crates/ureq
 Source:         %{crates_source}
 # Manually created patch for downstream crate metadata changes
-# * temporarily drop brotli feature
-#   until brotli 5+ / brotli-decompressor 4.x is packaged
 # * bump cookie_store dependency from 0.21 to 0.22:
 #   https://github.com/algesten/ureq/commit/a24929b
+# * bump brotli-decompressor dependency from v4 to v5:
+#   https://github.com/algesten/ureq/commit/a24929bbf887979f3eaf39acda3ea127a08898f2
 Patch:          ureq-fix-metadata.diff
 
 BuildRequires:  cargo-rpm-macros >= 24
@@ -59,6 +59,18 @@ use the "default" feature of the "%{crate}" crate.
 %files       -n %{name}+default-devel
 %ghost %{crate_instdir}/Cargo.toml
 
+%package     -n %{name}+brotli-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+brotli-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "brotli" feature of the "%{crate}" crate.
+
+%files       -n %{name}+brotli-devel
+%ghost %{crate_instdir}/Cargo.toml
+
 %package     -n %{name}+charset-devel
 Summary:        %{summary}
 BuildArch:      noarch

diff --git a/rust2rpm.toml b/rust2rpm.toml
index 1a83879..e494149 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,10 +1,10 @@
 [package]
 cargo-toml-patch-comments = [
-    """\
-    temporarily drop brotli feature
-    until brotli 5+ / brotli-decompressor 4.x is packaged
-    """,
     "bump cookie_store dependency from 0.21 to 0.22: https://github.com/algesten/ureq/commit/a24929b",
+    """\
+bump brotli-decompressor dependency from v4 to v5: \
+https://github.com/algesten/ureq/commit/a24929bbf887979f3eaf39acda3ea127a08898f2\
+""",
 ]
 
 [features]

diff --git a/ureq-fix-metadata.diff b/ureq-fix-metadata.diff
index 54b0b89..57b1aa3 100644
--- a/ureq-fix-metadata.diff
+++ b/ureq-fix-metadata.diff
@@ -1,16 +1,15 @@
 --- ureq-2.12.1/Cargo.toml	1970-01-01T00:00:01+00:00
-+++ ureq-2.12.1/Cargo.toml	2025-12-30T19:41:38.209718+00:00
-@@ -104,17 +104,13 @@
- [dependencies.base64]
++++ ureq-2.12.1/Cargo.toml	2026-06-28T06:57:54.057318+00:00
+@@ -105,7 +105,7 @@
  version = "0.22"
  
--[dependencies.brotli-decompressor]
+ [dependencies.brotli-decompressor]
 -version = "4.0.0"
--optional = true
--
- [dependencies.cookie]
- version = "0.18"
++version = "5.0.0"
  optional = true
+ 
+ [dependencies.cookie]
+@@ -114,7 +114,7 @@
  default-features = false
  
  [dependencies.cookie_store]
@@ -19,11 +18,3 @@
  features = [
      "preserve_order",
      "serde_json",
-@@ -212,7 +208,6 @@
- features = ["derive"]
- 
- [features]
--brotli = ["dep:brotli-decompressor"]
- charset = ["dep:encoding_rs"]
- cookies = [
-     "dep:cookie",

                 reply	other threads:[~2026-07-01 10:45 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178290274773.1.3464427822940611980.rpms-rust-ureq-0735049809eb@fedoraproject.org \
    --to=code@musicinmybrain.net \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox