From fa263e61393009f0c068ae4ec60976d46961a4b1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 2 Nov 2016 11:02:34 -0500 Subject: [PATCH] pull in upstream fixes --- .gitignore | 3 +++ sddm.spec | 14 ++++++++++++-- sources | 3 +++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index df6ca07..9c872e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ /v0.13.0.tar.gz /angle-down.png /v0.14.0.tar.gz +/0001-Fix-display-of-user-avatars.-684.patch +/0002-Remove-quotes-from-ServerArguments-696.patch +/0003-Add-a-config-option-to-enable-high-DPI-scaling-701.patch diff --git a/sddm.spec b/sddm.spec index b6d7577..b3a9308 100644 --- a/sddm.spec +++ b/sddm.spec @@ -2,7 +2,7 @@ Name: sddm Version: 0.14.0 -Release: 4%{?dist} +Release: 5%{?dist} # code GPLv2+, fedora theme CC-BY-SA License: GPLv2+ and CC-BY-SA Summary: QML based X11 desktop manager @@ -10,8 +10,11 @@ Summary: QML based X11 desktop manager Url: https://github.com/sddm/sddm Source0: https://github.com/sddm/sddm/archive/v%{version}.tar.gz -## upstream patches +## upstream patches (in lookaside cache) #BuildRequires: git-core +Patch1: 0001-Fix-display-of-user-avatars.-684.patch +Patch2: 0002-Remove-quotes-from-ServerArguments-696.patch +Patch3: 0003-Add-a-config-option-to-enable-high-DPI-scaling-701.patch ## downstream patches Patch101: sddm-0.14.0-fedora_config.patch @@ -84,6 +87,10 @@ A collection of sddm themes, including: circles, elarun, maldives, maui. %prep %setup -q +%patch1 -p1 -b .0001 +%patch2 -p1 -b .0002 +%patch3 -p1 -b .0003 + %patch101 -p1 -b .fedora_config @@ -207,6 +214,9 @@ exit 0 %changelog +* Wed Nov 02 2016 Rex Dieter - 0.14.0-5 +- pull in upstream fixes + * Fri Oct 07 2016 Rex Dieter - 0.14.0-4 - sddm.conf default: Current=01-breeze-fedora diff --git a/sources b/sources index 85ab9b4..5b32def 100644 --- a/sources +++ b/sources @@ -1,2 +1,5 @@ d8d1359a45fd11e05e1f13c8d175fd79 angle-down.png 393fbed2f2e9d030e1717949867e96c8 v0.14.0.tar.gz +a1ea9627b3a502c8a197581ff687fff4 0001-Fix-display-of-user-avatars.-684.patch +5ab2516031961b233c3a167cc015db15 0002-Remove-quotes-from-ServerArguments-696.patch +00c792545faabd15e79cd481bf967e6a 0003-Add-a-config-option-to-enable-high-DPI-scaling-701.patch