From 340dd8aed594ee80c8259c25d70266bb4a58cfdb Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 26 Jun 2020 11:04:12 -0500 Subject: [PATCH] pull in upstream fix for duplicate session name --- .gitignore | 1 + sddm.spec | 8 +++++++- sources | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8dc9842..7fc5c11 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /v0.18.0.tar.gz /0015-Use-C-scoping-for-handling-buffer-deletion.patch /v0.18.1.tar.gz +/0035-Prevent-duplicate-session-name.patch diff --git a/sddm.spec b/sddm.spec index 04613a6..348c077 100644 --- a/sddm.spec +++ b/sddm.spec @@ -2,7 +2,7 @@ Name: sddm Version: 0.18.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Summary: QML based X11 desktop manager @@ -10,6 +10,7 @@ Url: https://github.com/sddm/sddm Source0: https://github.com/sddm/sddm/archive/v%{version}.tar.gz ## upstream patches (in lookaside cache) +Patch35: 0035-Prevent-duplicate-session-name.patch ## upstreamable patches # Fixes RHBZ #1392654 @@ -93,6 +94,8 @@ A collection of sddm themes, including: elarun, maldives, maya %prep %setup -q +%patch35 -p1 -b 0035 + #patch54 -p1 -b .0054 %patch101 -p1 -b .fedora_config @@ -210,6 +213,9 @@ exit 0 %changelog +* Fri Jun 26 2020 Rex Dieter - 0.18.1-6 +- pull in upstream fix for duplicate session name + * Wed Apr 08 2020 Rex Dieter - 0.18.1-5 - remove pam_console dependency (#182218) diff --git a/sources b/sources index 595c312..6cd5d15 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (v0.18.1.tar.gz) = 18d5b9ee5e4d022ac86e10cde1c70c5475aeaff86d41d8b9897bc26953f5b6d042a7fef1d6e727865ebeb003a730455656765ba53350a665891113afd4dfa7d8 +SHA512 (0035-Prevent-duplicate-session-name.patch) = 043c11b122cd8749ec8dba06e9f33a1446398d321d6297fbb24709c8ff5b48201dc33e8c60a9f493765fdf7d4ef7fe257e12a78deb985a8a368f2a28472e8ff6