From 75c6a7c22649b2529d053ee2940f91c3bddc8004 Mon Sep 17 00:00:00 2001
From: Petr Sabata <psabata@redhat.com>
Date: Apr 22 2011 12:24:02 +0000
Subject: Include upstream bugfixes


297116d7e65a, 4d3769ac5d02 and d8975fb0640f.

---

diff --git a/slock.spec b/slock.spec
index 465fad0..3085de7 100644
--- a/slock.spec
+++ b/slock.spec
@@ -1,12 +1,16 @@
 Name:           slock
 Version:        0.9
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Simple X display locker
 Group:          User Interface/X
 License:        MIT
 URL:            http://tools.suckless.org/%{name}
 Source0:        http://dl.suckless.org/tools/%{name}-%{version}.tar.gz
 Patch0:         slock-0.9-flags.patch
+# Upstream patches since 0.9
+Patch101:       slock-0.9-dpms-timeout.patch
+Patch102:       slock-0.9-old-style-multiheaded-setup.patch
+Patch103:       slock-0.9-passwd-availability-check.patch
 
 BuildRequires:  libX11-devel libXext-devel 
 
@@ -20,12 +24,16 @@ the local pub.
 %setup -q
 # set fedora generic compiler flags and allow debuginfo generation
 %patch0 -p1 -b .flags
+# upstream patches for 0.9
+%patch101 -p1 -b .dpms-timeout
+%patch102 -p1 -b .multiheaded
+%patch103 -p1 -b .passwd
 
 %build
 make %{?_smp_mflags}
 
 %install
-make install PREFIX=$RPM_BUILD_ROOT/usr
+make install PREFIX=%{buildroot}/usr
 
 %files
 %defattr(-,root,root,-)
@@ -35,6 +43,10 @@ make install PREFIX=$RPM_BUILD_ROOT/usr
 # binary for light windowmanagers, and it shouldn't appear in applications menu
 
 %changelog
+* Fri Apr 22 2011 Petr Sabata <psabata@redhat.com> - 0.9-9
+- Include upstream bugfixes for last three years; this includes better
+  multiheaded and DPMS support, as well as check for password availability
+
 * Tue Mar 01 2011 Petr Sabata <psabata@redhat.com> - 0.9-8
 - Spec cleanup -- buildroot garbage removed, URL and Source corrected