From 009bf843dd364b54f293ccc8039b155fca4d3b3a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 7 Feb 2024 10:24:56 +0100 Subject: [PATCH] Drop downstream patch that downgraded pretty_env_logger dep to 0.4 We now have pretty_env_logger 0.5 in Fedora. --- ...wngrade-pretty_env_logger-dep-to-0.4.patch | 24 ------------------- gnome-tour.spec | 10 ++++---- 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 0001-Downgrade-pretty_env_logger-dep-to-0.4.patch diff --git a/0001-Downgrade-pretty_env_logger-dep-to-0.4.patch b/0001-Downgrade-pretty_env_logger-dep-to-0.4.patch deleted file mode 100644 index 42c93a5..0000000 --- a/0001-Downgrade-pretty_env_logger-dep-to-0.4.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a095b645982ee8ab763305a0f28ad72c5faec2e0 Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Tue, 19 Sep 2023 21:45:38 +0200 -Subject: [PATCH] Downgrade pretty_env_logger dep to 0.4 - -Fedora only has version 0.4. ---- - Cargo.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Cargo.toml b/Cargo.toml -index 89e96ef..728ae8f 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -10,5 +10,5 @@ gtk = { package = "gtk4", version = "0.7", features= ["gnome_45"]} - log = "0.4" - gettext-rs = { version = "0.7", features = ["gettext-system"] } - adw = {package = "libadwaita", version = "0.5"} --pretty_env_logger = "0.5" -+pretty_env_logger = "0.4" - regex = "1.5" --- -2.41.0 - diff --git a/gnome-tour.spec b/gnome-tour.spec index eae8b2b..cef1c89 100644 --- a/gnome-tour.spec +++ b/gnome-tour.spec @@ -10,7 +10,7 @@ Name: gnome-tour Version: 45.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GNOME Tour and Greeter # * gnome-tour source code is GPLv3+ @@ -21,11 +21,6 @@ Source0: https://download.gnome.org/sources/%{name}/45/%{name}-%{tarball_ # https://pagure.io/fedora-workstation/issue/175 Source1: welcome-fedora.svg -%if 0%{?fedora} -# Fedora only has version 0.4 -Patch: 0001-Downgrade-pretty_env_logger-dep-to-0.4.patch -%endif - BuildRequires: meson BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gio-2.0) @@ -106,6 +101,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/org.gnome.Tour.des %changelog +* Wed Feb 07 2024 Kalev Lember - 45.0-5 +- Drop downstream patch that downgraded pretty_env_logger dep to 0.4 + * Thu Feb 01 2024 Yaakov Selkowitz - 45.0-4 - Update Rust macro usage