public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/aw-server-rust] rawhide: Update to b2e2dee
@ 2026-08-16 10:03
0 siblings, 0 replies; only message in thread
From: @ 2026-08-16 10:03 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/aw-server-rust
Branch : rawhide
Commit : eac5e309f09136edd62d548dd7b524ec353fd818
Author : Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>
Date : 2026-08-16T11:44:44+02:00
Stats : +236/-182 in 16 file(s)
URL : https://src.fedoraproject.org/rpms/aw-server-rust/c/eac5e309f09136edd62d548dd7b524ec353fd818?branch=rawhide
Log:
Update to b2e2dee
---
diff --git a/.gitignore b/.gitignore
index 5a30ce5..269b5f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/aw-server-rust-9a8802a.tar.gz
/aw-server-rust-df49b3d.tar.gz
/aw-server-rust-b199671.tar.gz
+/aw-server-rust-b2e2dee.tar.gz
diff --git a/0001-Remove-vendored-openssl.patch b/0001-Remove-vendored-openssl.patch
index f820fdc..00056c2 100644
--- a/0001-Remove-vendored-openssl.patch
+++ b/0001-Remove-vendored-openssl.patch
@@ -1,8 +1,8 @@
-From 25b795af707612a1414a298dc50ee5f1d8b9ed03 Mon Sep 17 00:00:00 2001
+From 21e70fe5551950440bbc6e9060501ea5f28b097e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
<lukasz.wojnilowicz@gmail.com>
Date: Mon, 9 Dec 2024 17:13:00 +0100
-Subject: [PATCH 1/7] Remove vendored openssl
+Subject: [PATCH 1/9] Remove vendored openssl
---
aw-sync/Cargo.toml | 3 ---
diff --git a/0002-Remove-Android-dependencies.patch b/0002-Remove-Android-dependencies.patch
index 9d393a5..088b524 100644
--- a/0002-Remove-Android-dependencies.patch
+++ b/0002-Remove-Android-dependencies.patch
@@ -1,8 +1,8 @@
-From 45d2e8a9ddb18877eaeb238f6ff566d3902cac65 Mon Sep 17 00:00:00 2001
+From d3168a7591203ec24f2b4897027541bcf38b71ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
<lukasz.wojnilowicz@gmail.com>
Date: Mon, 9 Dec 2024 17:21:41 +0100
-Subject: [PATCH 2/7] Remove Android dependencies
+Subject: [PATCH 2/9] Remove Android dependencies
---
aw-server/Cargo.toml | 7 -------
@@ -10,10 +10,10 @@ Subject: [PATCH 2/7] Remove Android dependencies
2 files changed, 10 deletions(-)
diff --git a/aw-server/Cargo.toml b/aw-server/Cargo.toml
-index 814a621..58f4e1f 100644
+index 230645d..7109db4 100644
--- a/aw-server/Cargo.toml
+++ b/aw-server/Cargo.toml
-@@ -50,10 +50,3 @@ sd-notify = "0.4.2"
+@@ -51,10 +51,3 @@ sd-notify = "0.4.2"
[target.'cfg(all(target_os="linux", target_arch="x86"))'.dependencies]
jemallocator = "0.5.0"
diff --git a/0003-Remove-jemallocator.patch b/0003-Remove-jemallocator.patch
index 785e655..f5c9968 100644
--- a/0003-Remove-jemallocator.patch
+++ b/0003-Remove-jemallocator.patch
@@ -1,8 +1,8 @@
-From 1dc2e713794a34dfb25e73674c5fa095cc130518 Mon Sep 17 00:00:00 2001
+From 94df1d7ff45e0815c5b1ce493e625cfa13be589b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
<lukasz.wojnilowicz@gmail.com>
Date: Mon, 9 Dec 2024 17:24:49 +0100
-Subject: [PATCH 3/7] Remove jemallocator
+Subject: [PATCH 3/9] Remove jemallocator
---
aw-server/Cargo.toml | 2 --
@@ -10,10 +10,10 @@ Subject: [PATCH 3/7] Remove jemallocator
2 files changed, 7 deletions(-)
diff --git a/aw-server/Cargo.toml b/aw-server/Cargo.toml
-index 58f4e1f..8347d45 100644
+index 7109db4..21c4a33 100644
--- a/aw-server/Cargo.toml
+++ b/aw-server/Cargo.toml
-@@ -48,5 +48,3 @@ aw-query = { path = "../aw-query" }
+@@ -49,5 +49,3 @@ aw-query = { path = "../aw-query" }
[target.'cfg(target_os="linux")'.dependencies]
sd-notify = "0.4.2"
diff --git a/0004-Allow-fancy-regex-versions-through-0.17.patch b/0004-Allow-fancy-regex-versions-through-0.17.patch
deleted file mode 100644
index bafd7d7..0000000
--- a/0004-Allow-fancy-regex-versions-through-0.17.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2cf66e0e3933e821a5918a0e07e4d1892541d062 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
- <lukasz.wojnilowicz@gmail.com>
-Date: Mon, 9 Dec 2024 17:44:27 +0100
-Subject: [PATCH 4/7] Allow fancy-regex versions through 0.17
-
-https://github.com/ActivityWatch/aw-server-rust/pull/558
----
- aw-query/Cargo.toml | 2 +-
- aw-transform/Cargo.toml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/aw-query/Cargo.toml b/aw-query/Cargo.toml
-index 37b025b..0eabeb8 100644
---- a/aw-query/Cargo.toml
-+++ b/aw-query/Cargo.toml
-@@ -12,7 +12,7 @@ serde_json = "1.0"
- chrono = { version = "0.4", features = ["serde"] }
- plex = "0.3.0"
- log = "0.4"
--fancy-regex = "0.12.0"
-+fancy-regex = ">=0.13.0, <0.18.0"
- aw-datastore = { path = "../aw-datastore" }
- aw-models = { path = "../aw-models" }
- aw-transform = { path = "../aw-transform" }
-diff --git a/aw-transform/Cargo.toml b/aw-transform/Cargo.toml
-index c61735e..6324321 100644
---- a/aw-transform/Cargo.toml
-+++ b/aw-transform/Cargo.toml
-@@ -10,7 +10,7 @@ edition = "2021"
- serde = "1.0"
- url = ">=2.2"
- serde_json = "1.0"
--fancy-regex = "0.12.0"
-+fancy-regex = ">=0.13.0, <0.18.0"
- log = "0.4"
- chrono = { version = "0.4", features = ["serde"] }
- aw-models = { path = "../aw-models" }
---
-2.54.0
-
diff --git a/0004-Fix-fancy-regex-dependency-to-the-one-used-in-Fedora.patch b/0004-Fix-fancy-regex-dependency-to-the-one-used-in-Fedora.patch
new file mode 100644
index 0000000..fe227e8
--- /dev/null
+++ b/0004-Fix-fancy-regex-dependency-to-the-one-used-in-Fedora.patch
@@ -0,0 +1,40 @@
+From 86618807aad2d7ffabb57f14b2ff3609f0f4dde6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
+ <lukasz.wojnilowicz@gmail.com>
+Date: Sun, 16 Aug 2026 11:05:51 +0200
+Subject: [PATCH 4/9] Fix fancy-regex dependency to the one used in Fedora
+
+---
+ aw-query/Cargo.toml | 2 +-
+ aw-transform/Cargo.toml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/aw-query/Cargo.toml b/aw-query/Cargo.toml
+index fdba896..27259ce 100644
+--- a/aw-query/Cargo.toml
++++ b/aw-query/Cargo.toml
+@@ -12,7 +12,7 @@ serde_json = "1.0"
+ chrono = { version = "0.4", features = ["serde"] }
+ plex = "0.3.0"
+ log = "0.4"
+-fancy-regex = "0.17.0"
++fancy-regex = ">=0.16.2, <0.18.0"
+ aw-datastore = { path = "../aw-datastore" }
+ aw-models = { path = "../aw-models" }
+ aw-transform = { path = "../aw-transform" }
+diff --git a/aw-transform/Cargo.toml b/aw-transform/Cargo.toml
+index 3d77a29..f966972 100644
+--- a/aw-transform/Cargo.toml
++++ b/aw-transform/Cargo.toml
+@@ -10,7 +10,7 @@ edition = "2021"
+ serde = "1.0"
+ url = ">=2.2"
+ serde_json = "1.0"
+-fancy-regex = "0.17.0"
++fancy-regex = ">=0.16.2, <0.18.0"
+ lru = "0.18.1"
+ log = "0.4"
+ chrono = { version = "0.4", features = ["serde"] }
+--
+2.54.0
+
diff --git a/0005-Fix-lru-dependency-to-the-one-used-in-Fedora.patch b/0005-Fix-lru-dependency-to-the-one-used-in-Fedora.patch
new file mode 100644
index 0000000..16044be
--- /dev/null
+++ b/0005-Fix-lru-dependency-to-the-one-used-in-Fedora.patch
@@ -0,0 +1,26 @@
+From 10f1cb9f9f040a4d6683c0e743fb170b07482b32 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
+ <lukasz.wojnilowicz@gmail.com>
+Date: Sun, 16 Aug 2026 10:02:03 +0200
+Subject: [PATCH 5/9] Fix lru dependency to the one used in Fedora
+
+---
+ aw-transform/Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/aw-transform/Cargo.toml b/aw-transform/Cargo.toml
+index f966972..fb13dbc 100644
+--- a/aw-transform/Cargo.toml
++++ b/aw-transform/Cargo.toml
+@@ -11,7 +11,7 @@ serde = "1.0"
+ url = ">=2.2"
+ serde_json = "1.0"
+ fancy-regex = ">=0.16.2, <0.18.0"
+-lru = "0.18.1"
++lru = ">=0.16.4, <0.19.0"
+ log = "0.4"
+ chrono = { version = "0.4", features = ["serde"] }
+ aw-models = { path = "../aw-models" }
+--
+2.54.0
+
diff --git a/0005-Fix-rusqlite-dependency-to-the-one-used-in-Fedora.patch b/0005-Fix-rusqlite-dependency-to-the-one-used-in-Fedora.patch
deleted file mode 100644
index a5ade6a..0000000
--- a/0005-Fix-rusqlite-dependency-to-the-one-used-in-Fedora.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ed864a929da9f0358351a002b4fb347ec813d7a4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
- <lukasz.wojnilowicz@gmail.com>
-Date: Mon, 9 Dec 2024 17:47:23 +0100
-Subject: [PATCH 5/7] Fix rusqlite dependency to the one used in Fedora
-
----
- aw-datastore/Cargo.toml | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/aw-datastore/Cargo.toml b/aw-datastore/Cargo.toml
-index e00bed4..3321cdd 100644
---- a/aw-datastore/Cargo.toml
-+++ b/aw-datastore/Cargo.toml
-@@ -7,7 +7,7 @@ edition = "2021"
- [features]
- default = ["bundled"]
- # Use bundled SQLite (default, no encryption support)
--bundled = ["rusqlite/bundled"]
-+bundled = []
- # Use bundled SQLCipher for encrypted databases (mutually exclusive with 'bundled')
- # Build with: cargo build --no-default-features --features encryption
- # Requires OpenSSL. Use 'encryption-vendored' to vendor OpenSSL as well.
-@@ -21,7 +21,7 @@ dirs = "6"
- serde = "1.0"
- serde_json = "1.0"
- chrono = { version = "0.4", features = ["serde"] }
--rusqlite = { version = "0.30", features = ["chrono", "serde_json"] }
-+rusqlite = { version = "0.31", features = ["chrono", "serde_json"] }
- mpsc_requests = "0.3"
- log = "0.4"
- zeroize = { version = "1", optional = true, features = ["alloc"] }
-@@ -32,4 +32,4 @@ regex = "1"
-
- [dev-dependencies]
- # Used by migration tests to construct databases with old schema versions
--rusqlite = { version = "0.30", features = ["chrono", "serde_json"] }
-+rusqlite = { version = "0.31", features = ["chrono", "serde_json"] }
---
-2.54.0
-
diff --git a/0006-Fix-rusqlite-dependency-to-the-one-used-in-Fedora.patch b/0006-Fix-rusqlite-dependency-to-the-one-used-in-Fedora.patch
new file mode 100644
index 0000000..1780e5e
--- /dev/null
+++ b/0006-Fix-rusqlite-dependency-to-the-one-used-in-Fedora.patch
@@ -0,0 +1,41 @@
+From 44cc8a81b1322ac336634d2a88061072087ada97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
+ <lukasz.wojnilowicz@gmail.com>
+Date: Mon, 9 Dec 2024 17:47:23 +0100
+Subject: [PATCH 6/9] Fix rusqlite dependency to the one used in Fedora
+
+---
+ aw-datastore/Cargo.toml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/aw-datastore/Cargo.toml b/aw-datastore/Cargo.toml
+index e00bed4..3321cdd 100644
+--- a/aw-datastore/Cargo.toml
++++ b/aw-datastore/Cargo.toml
+@@ -7,7 +7,7 @@ edition = "2021"
+ [features]
+ default = ["bundled"]
+ # Use bundled SQLite (default, no encryption support)
+-bundled = ["rusqlite/bundled"]
++bundled = []
+ # Use bundled SQLCipher for encrypted databases (mutually exclusive with 'bundled')
+ # Build with: cargo build --no-default-features --features encryption
+ # Requires OpenSSL. Use 'encryption-vendored' to vendor OpenSSL as well.
+@@ -21,7 +21,7 @@ dirs = "6"
+ serde = "1.0"
+ serde_json = "1.0"
+ chrono = { version = "0.4", features = ["serde"] }
+-rusqlite = { version = "0.30", features = ["chrono", "serde_json"] }
++rusqlite = { version = "0.31", features = ["chrono", "serde_json"] }
+ mpsc_requests = "0.3"
+ log = "0.4"
+ zeroize = { version = "1", optional = true, features = ["alloc"] }
+@@ -32,4 +32,4 @@ regex = "1"
+
+ [dev-dependencies]
+ # Used by migration tests to construct databases with old schema versions
+-rusqlite = { version = "0.30", features = ["chrono", "serde_json"] }
++rusqlite = { version = "0.31", features = ["chrono", "serde_json"] }
+--
+2.54.0
+
diff --git a/0006-Remove-criterion.patch b/0006-Remove-criterion.patch
deleted file mode 100644
index 7f71a94..0000000
--- a/0006-Remove-criterion.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6253afc653c180bb84ebea3abcf34ec13f834763 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
- <lukasz.wojnilowicz@gmail.com>
-Date: Mon, 9 Dec 2024 17:57:00 +0100
-Subject: [PATCH 6/7] Remove criterion
-
----
- aw-query/Cargo.toml | 3 ---
- aw-transform/Cargo.toml | 3 ---
- 2 files changed, 6 deletions(-)
-
-diff --git a/aw-query/Cargo.toml b/aw-query/Cargo.toml
-index 0eabeb8..78d6266 100644
---- a/aw-query/Cargo.toml
-+++ b/aw-query/Cargo.toml
-@@ -17,9 +17,6 @@ aw-datastore = { path = "../aw-datastore" }
- aw-models = { path = "../aw-models" }
- aw-transform = { path = "../aw-transform" }
-
--[dev-dependencies]
--criterion = "0.5.1"
--
- [[bench]]
- name = "benchmark"
- harness = false
-diff --git a/aw-transform/Cargo.toml b/aw-transform/Cargo.toml
-index 6324321..fc2b224 100644
---- a/aw-transform/Cargo.toml
-+++ b/aw-transform/Cargo.toml
-@@ -15,9 +15,6 @@ log = "0.4"
- chrono = { version = "0.4", features = ["serde"] }
- aw-models = { path = "../aw-models" }
-
--[dev-dependencies]
--criterion = "0.5.1"
--
- [[bench]]
- name = "bench"
- harness = false
---
-2.54.0
-
diff --git a/0007-Allow-dirs-6.patch b/0007-Allow-dirs-6.patch
deleted file mode 100644
index 688d03d..0000000
--- a/0007-Allow-dirs-6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 403264cc39f2077418b0959710c0801d9483d31c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
- <lukasz.wojnilowicz@gmail.com>
-Date: Sun, 8 Mar 2026 11:14:59 +0100
-Subject: [PATCH 7/7] Allow dirs 6
-
----
- aw-server/Cargo.toml | 2 +-
- aw-sync/Cargo.toml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/aw-server/Cargo.toml b/aw-server/Cargo.toml
-index 8347d45..87c9c81 100644
---- a/aw-server/Cargo.toml
-+++ b/aw-server/Cargo.toml
-@@ -29,7 +29,7 @@ rocket_cors = { version = "0.6.0" }
- serde = { version = "1.0", features = ["derive"] }
- serde_json = "1.0"
- chrono = { version = "0.4", features = ["serde"] }
--dirs = "6"
-+dirs = ">=4.0, <7.0"
- lazy_static = "1.4"
- log = "0.4"
- fern = { version = "0.7", features = ["colored"] }
-diff --git a/aw-sync/Cargo.toml b/aw-sync/Cargo.toml
-index 37075d8..7918185 100644
---- a/aw-sync/Cargo.toml
-+++ b/aw-sync/Cargo.toml
-@@ -20,7 +20,7 @@ chrono = { version = "0.4", features = ["serde"] }
- serde = "1.0"
- serde_json = "1.0"
- reqwest = { version = "0.12", features = ["json", "blocking"] }
--dirs = "6"
-+dirs = ">=5.0.1, <7.0"
- gethostname = "0.4.3"
-
- # CLI-only dependencies (optional)
---
-2.54.0
-
diff --git a/0007-Fix-proptest-dependency-to-the-one-used-in-Fedora.patch b/0007-Fix-proptest-dependency-to-the-one-used-in-Fedora.patch
new file mode 100644
index 0000000..7d74665
--- /dev/null
+++ b/0007-Fix-proptest-dependency-to-the-one-used-in-Fedora.patch
@@ -0,0 +1,26 @@
+From 63e2e4aba35b839a8324139f2a7d340ca89ea88f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
+ <lukasz.wojnilowicz@gmail.com>
+Date: Sun, 16 Aug 2026 11:29:20 +0200
+Subject: [PATCH 7/9] Fix proptest dependency to the one used in Fedora
+
+---
+ aw-query/Cargo.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/aw-query/Cargo.toml b/aw-query/Cargo.toml
+index 27259ce..8b61b4f 100644
+--- a/aw-query/Cargo.toml
++++ b/aw-query/Cargo.toml
+@@ -19,7 +19,7 @@ aw-transform = { path = "../aw-transform" }
+
+ [dev-dependencies]
+ criterion = "0.5.1"
+-proptest = "1.4"
++proptest = ">=1.4.0, <1.12.0"
+
+ [[bench]]
+ name = "benchmark"
+--
+2.54.0
+
diff --git a/0008-Remove-criterion.patch b/0008-Remove-criterion.patch
new file mode 100644
index 0000000..206d40e
--- /dev/null
+++ b/0008-Remove-criterion.patch
@@ -0,0 +1,40 @@
+From b6424b40345b361e098f4f334612be6621fb7e74 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
+ <lukasz.wojnilowicz@gmail.com>
+Date: Mon, 9 Dec 2024 17:57:00 +0100
+Subject: [PATCH 8/9] Remove criterion
+
+---
+ aw-query/Cargo.toml | 1 -
+ aw-transform/Cargo.toml | 3 ---
+ 2 files changed, 4 deletions(-)
+
+diff --git a/aw-query/Cargo.toml b/aw-query/Cargo.toml
+index 8b61b4f..5e0a158 100644
+--- a/aw-query/Cargo.toml
++++ b/aw-query/Cargo.toml
+@@ -18,7 +18,6 @@ aw-models = { path = "../aw-models" }
+ aw-transform = { path = "../aw-transform" }
+
+ [dev-dependencies]
+-criterion = "0.5.1"
+ proptest = ">=1.4.0, <1.12.0"
+
+ [[bench]]
+diff --git a/aw-transform/Cargo.toml b/aw-transform/Cargo.toml
+index fb13dbc..9a9edc9 100644
+--- a/aw-transform/Cargo.toml
++++ b/aw-transform/Cargo.toml
+@@ -16,9 +16,6 @@ log = "0.4"
+ chrono = { version = "0.4", features = ["serde"] }
+ aw-models = { path = "../aw-models" }
+
+-[dev-dependencies]
+-criterion = "0.5.1"
+-
+ [[bench]]
+ name = "bench"
+ harness = false
+--
+2.54.0
+
diff --git a/0009-Allow-dirs-6.patch b/0009-Allow-dirs-6.patch
new file mode 100644
index 0000000..c2ac36d
--- /dev/null
+++ b/0009-Allow-dirs-6.patch
@@ -0,0 +1,40 @@
+From 629102cbcd16393bcf8313a3869deb23b8234dfb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Wojni=C5=82owicz?=
+ <lukasz.wojnilowicz@gmail.com>
+Date: Sun, 8 Mar 2026 11:14:59 +0100
+Subject: [PATCH 9/9] Allow dirs 6
+
+---
+ aw-server/Cargo.toml | 2 +-
+ aw-sync/Cargo.toml | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/aw-server/Cargo.toml b/aw-server/Cargo.toml
+index 21c4a33..0015f23 100644
+--- a/aw-server/Cargo.toml
++++ b/aw-server/Cargo.toml
+@@ -29,7 +29,7 @@ rocket_cors = { version = "0.6.0" }
+ serde = { version = "1.0", features = ["derive"] }
+ serde_json = "1.0"
+ chrono = { version = "0.4", features = ["serde"] }
+-dirs = "6"
++dirs = ">=4.0, <7.0"
+ lazy_static = "1.4"
+ log = "0.4"
+ fern = { version = "0.7", features = ["colored"] }
+diff --git a/aw-sync/Cargo.toml b/aw-sync/Cargo.toml
+index 37075d8..7918185 100644
+--- a/aw-sync/Cargo.toml
++++ b/aw-sync/Cargo.toml
+@@ -20,7 +20,7 @@ chrono = { version = "0.4", features = ["serde"] }
+ serde = "1.0"
+ serde_json = "1.0"
+ reqwest = { version = "0.12", features = ["json", "blocking"] }
+-dirs = "6"
++dirs = ">=5.0.1, <7.0"
+ gethostname = "0.4.3"
+
+ # CLI-only dependencies (optional)
+--
+2.54.0
+
diff --git a/aw-server-rust.spec b/aw-server-rust.spec
index eb91ddc..3909f59 100644
--- a/aw-server-rust.spec
+++ b/aw-server-rust.spec
@@ -1,10 +1,10 @@
%bcond check 1
-%global commit b1996715a90cbf0a1b2ca724ff1a1def8dc2ee20
+%global commit b2e2dee7eead1152df5489e60ccdf78328127352
%global short_commit %(c=%{commit}; echo ${c:0:7})
Name: aw-server-rust
-Version: 0.14.0^20260624.git%{short_commit}
+Version: 0.14.0^20260816.git%{short_commit}
Release: %autorelease
Summary: A re-implementation of aw-server in Rust
# (Apache-2.0 OR MIT) AND BSD-3-Clause
@@ -37,14 +37,18 @@ Patch0: 0001-Remove-vendored-openssl.patch
Patch1: 0002-Remove-Android-dependencies.patch
# jemallocator will not be packaged for Fedora, so remove it
Patch2: 0003-Remove-jemallocator.patch
-# https://github.com/ActivityWatch/aw-server-rust/pull/558
-Patch3: 0004-Allow-fancy-regex-versions-through-0.17.patch
# switch to dependency versions available in Fedora
-Patch4: 0005-Fix-rusqlite-dependency-to-the-one-used-in-Fedora.patch
+Patch3: 0004-Fix-fancy-regex-dependency-to-the-one-used-in-Fedora.patch
+# switch to dependency versions available in Fedora
+Patch4: 0005-Fix-lru-dependency-to-the-one-used-in-Fedora.patch
+# switch to dependency versions available in Fedora
+Patch5: 0006-Fix-rusqlite-dependency-to-the-one-used-in-Fedora.patch
+# switch to dependency versions available in Fedora
+Patch6: 0007-Fix-proptest-dependency-to-the-one-used-in-Fedora.patch
# drop an unused, benchmark-only criterion dev-dependency to speed up builds
-Patch5: 0006-Remove-criterion.patch
+Patch7: 0008-Remove-criterion.patch
# https://github.com/ActivityWatch/aw-server-rust/pull/545
-Patch6: 0007-Allow-dirs-6.patch
+Patch8: 0009-Allow-dirs-6.patch
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: systemd-rpm-macros
diff --git a/sources b/sources
index 06a0e56..b929235 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (aw-server-rust-b199671.tar.gz) = 217f9f769af7c4998307884fe53b44d3221eb511352615d4882742cc0486545873247c8d4cd708a62c0e50f09448470f2ba61b683727d339292583566e53c63a
+SHA512 (aw-server-rust-b2e2dee.tar.gz) = 2fdb54169c8aab02003f1cf0dc95f3e08c2cb8c51bfbf521ad85ca8a7b8a89cfb46cf871af16fd4d6b430272d903e7d5566c44175e8058a3e224bc0c5e9a0f75
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-16 10:03 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-16 10:03 [rpms/aw-server-rust] rawhide: Update to b2e2dee
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox