[dbxtool/f22] Merge feedback about dbxtool.service

[Peter Jones]

commit 4df2971ddbe2ed8e9a50273c71b552858bcbe7b2
Author: Peter Jones <pjones at redhat.com>
Date:   Mon Feb 23 10:20:42 2015 -0500

    Merge feedback about dbxtool.service
    
    Zbigniew Jędrzejewski-Szmek was kind enough to audit the systemd service,
    and had some suggestions, as did Harald Hoyer and Lennart Poettering.
    
    Related: rhbz#1181568
    
    Signed-off-by: Peter Jones <pjones at redhat.com>

 ...-some-more-changes-to-the-systemd-service.patch | 40 ++++++++++++++++++++++
 dbxtool.spec                                       | 10 ++++--
 2 files changed, 48 insertions(+), 2 deletions(-)
---
diff --git a/0001-Make-some-more-changes-to-the-systemd-service.patch b/0001-Make-some-more-changes-to-the-systemd-service.patch
new file mode 100644
index 0000000..6f07c32
--- /dev/null
+++ b/0001-Make-some-more-changes-to-the-systemd-service.patch
@@ -0,0 +1,40 @@
+From b3212b2140ab778da36e79db29e0517e2c7c53c4 Mon Sep 17 00:00:00 2001
+From: Peter Jones <pjones at redhat.com>
+Date: Wed, 18 Feb 2015 13:16:53 -0500
+Subject: [PATCH] Make some more changes to the systemd service.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Zbigniew Jędrzejewski-Szmek was kind enough to audit what I'd done, and
+had some suggestions, as did Harald Hoyer and Lennart Poettering.
+
+This version reflects their input.
+
+Signed-off-by: Peter Jones <pjones at redhat.com>
+---
+ src/dbxtool.service | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/dbxtool.service b/src/dbxtool.service
+index 8ec65c5..4f3fff4 100644
+--- a/src/dbxtool.service
++++ b/src/dbxtool.service
+@@ -1,10 +1,10 @@
+ [Unit]
+-Description=Secure Boot DBX updater
+-RequiresMountsFor=/usr/bin/ /usr/share/dbxtool/
++Description=Secure Boot DBX (blacklist) updater
++ConditionPathExists=/sys/firmware/efi/efivars
+ 
+ [Install]
+-WantedBy=basic.target multi-user.target
++WantedBy=multi-user.target
+ 
+ [Service]
+-Type=oneshot
++RemainAfterExit=yes
+ ExecStart=/usr/bin/dbxtool -a /usr/share/dbxtool/
+-- 
+2.1.0
+
diff --git a/dbxtool.spec b/dbxtool.spec
index a3ee48b..b1080ab 100644
--- a/dbxtool.spec
+++ b/dbxtool.spec
@@ -1,6 +1,6 @@
 Name:           dbxtool
 Version:        0.6
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Secure Boot DBX updater
 License:        GPLv2
 URL:            https://github.com/vathpela/dbxtool
@@ -8,9 +8,10 @@ ExclusiveArch:  i386 x86_64 aarch64
 BuildRequires:  popt-devel git systemd
 BuildRequires:  efivar-devel >= 0.14-1
 Requires:       efivar >= 0.14-1
-Source0:        https://github.com/vathpela/dbxtool/releases/download/dbxtool-%{version}/dbxtool-%{version}.tar.bz2
 Requires(post): systemd
 Requires(preun):systemd
+Source0:        https://github.com/vathpela/dbxtool/releases/download/dbxtool-%{version}/dbxtool-%{version}.tar.bz2
+Patch0001:	0001-Make-some-more-changes-to-the-systemd-service.patch
 
 %description
 This package contains DBX updates for UEFI Secure Boot.
@@ -52,6 +53,11 @@ rm -f %{buildroot}/%{_docdir}/%{name}/COPYING
 %{_unitdir}/dbxtool.service
 
 %changelog
+* Mon Feb 23 2015 Peter Jones <pjones at redhat.com> - 0.6-4
+- Zbigniew Jędrzejewski-Szmek was kind enough to audit the systemd service,
+  and had some suggestions, as did Harald Hoyer and Lennart Poettering.
+  Related: rhbz#1181568
+
 * Tue Dec 09 2014 Peter Jones <pjones at redhat.com> - 0.6-3
 - Add systemd scriptlets for the service.