From 78de7a4521338bb41789e27451d62e5e999e2b4f Mon Sep 17 00:00:00 2001
From: Christian Kellner <christian@kellner.me>
Date: Tue, 20 Nov 2018 17:30:49 +0100
Subject: [PATCH] New upstream release (0.99.9)

- Drop unneccessary patch to fix udev events access
- Fix daemon lockdown issues (keyboard backlight, AC status changes)
- Out-of-tree build fixes and documentation fixes
---
 .gitignore                                    |  1 +
 ...wer-not-having-access-to-udev-events.patch | 32 -------------------
 sources                                       |  2 +-
 upower.spec                                   | 15 ++++++---
 4 files changed, 12 insertions(+), 38 deletions(-)
 delete mode 100644 0001-daemon-Fix-upower-not-having-access-to-udev-events.patch

diff --git a/.gitignore b/.gitignore
index f8ff88c..6be58d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ upower-0.9.5.tar.bz2
 /upower-0.99.6.tar.xz
 /upower-0.99.7.tar.xz
 /upower-0.99.8.tar.xz
+/upower-0.99.9.tar.xz
diff --git a/0001-daemon-Fix-upower-not-having-access-to-udev-events.patch b/0001-daemon-Fix-upower-not-having-access-to-udev-events.patch
deleted file mode 100644
index 31aea08..0000000
--- a/0001-daemon-Fix-upower-not-having-access-to-udev-events.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From fe356951a9d45fee73036aaa72661f0319dffba3 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Tue, 21 Aug 2018 13:30:44 +0200
-Subject: [PATCH] daemon: Fix upower not having access to udev events
-
-PrivateNetwork=true will cut off upower from the udev netlink socket, so
-it's not what we want to use, as we want those events.
-
-See https://lists.freedesktop.org/archives/systemd-devel/2018-July/041000.html
-
-Closes: #68
----
- src/upower.service.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/upower.service.in b/src/upower.service.in
-index 835529a..8838655 100644
---- a/src/upower.service.in
-+++ b/src/upower.service.in
-@@ -17,7 +17,8 @@ ProtectHome=true
- PrivateTmp=true
- 
- # Network
--PrivateNetwork=true
-+# PrivateNetwork=true would block udev's netlink socket
-+RestrictAddressFamilies=AF_UNIX AF_NETLINK
- 
- # Execute Mappings
- MemoryDenyWriteExecute=true
--- 
-2.19.0
-
diff --git a/sources b/sources
index 275704c..6cd3b01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (upower-0.99.8.tar.xz) = dfd2960cae382195dfc7a703a02af298d9de55bc626cde2a1f97e7983842191ba9d99eb2044190214e792539e7d6c9d8e00b5aed17e5e86b04544e9ab90278b1
+SHA512 (upower-0.99.9.tar.xz) = 45eb587b0e5ffcce88bad8c56bc5efa30559748913016a55d58313280f5159378e5fbb4a9842c3a6409257bb97822d235f96b03704268b8471455c93eb05fe2f
diff --git a/upower.spec b/upower.spec
index 965e17e..f5f7223 100644
--- a/upower.spec
+++ b/upower.spec
@@ -1,13 +1,12 @@
+%global commit  2282c7c0e53fb31816b824c9d1f547e8
 Summary:        Power Management Service
 Name:           upower
-Version:        0.99.8
-Release:        3%{?dist}
+Version:        0.99.9
+Release:        1%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://upower.freedesktop.org/
-Source0:        https://gitlab.freedesktop.org/upower/upower/uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/%{name}-%{version}.tar.xz
-# Backported from upstream
-Patch0:         0001-daemon-Fix-upower-not-having-access-to-udev-events.patch
+Source0:        https://gitlab.freedesktop.org/upower/upower/uploads/%{commit}/%{name}-%{version}.tar.xz
 
 BuildRequires:  sqlite-devel
 BuildRequires:  libtool
@@ -109,6 +108,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_datadir}/gtk-doc/html/UPower/*
 
 %changelog
+* Tue Nov 20 2018 Christian Kellner <ckellner@redhat.com> - 0.99.9-1
+- New upstream release
+- Drop unneccessary patch to fix udev events access
+- Fix daemon lockdown issues (keyboard backlight, AC status changes)
+- Out-of-tree build fixes and documentation fixes
+
 * Sun Oct 07 2018 Kalev Lember <klember@redhat.com> - 0.99.8-3
 - Backport an upstream fix for upower not having access to udev events