[i3lock] Updated to upstream stable 2.4.1

[Martin Preisler]

commit 62edbe4604a2ceeae041e41a503a6351a2f1ef14
Author: Martin Preisler <mpreisle at redhat.com>
Date:   Wed Jun 6 16:13:37 2012 +0200

    Updated to upstream stable 2.4.1

 .gitignore  |    1 +
 i3lock.spec |   36 ++++++++++++++++++------------------
 sources     |    2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index aef60e0..80ef2b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 i3lock-1.0-20100320git.tar.bz2
+/i3lock-2.4.1.tar.bz2
diff --git a/i3lock.spec b/i3lock.spec
index 50e5144..4e159fc 100644
--- a/i3lock.spec
+++ b/i3lock.spec
@@ -1,26 +1,23 @@
-%global git 20100320git
-%global gitversion 2e5bee5
-
 Name:           i3lock
-Version:        1.0
-Release:        6.%{git}%{?dist}
+Version:        2.4.1
+Release:        1
 Summary:        Simple X display locker
 
 Group:          User Interface/Desktops
 License:        MIT
-URL:            http://i3.zekjur.net/i3lock/
-#Source0:        http://i3.zekjur.net/%{name}/%{name}-%{version}.tar.bz2
-# git clone git://code.stapelberg.de/%{name}
-# cd %{name} && git reset --hard %{gitversion} && rm -rf .git .gitingore && cd ..
-# tar -czvf {name}-%{upstream_version}-%{git}.tar.bz2 %{name}
-Source0:        %{name}-%{version}-%{git}.tar.bz2
+URL:            http://i3wm.org/%{name}
+Source0:        http://i3wm.org/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.pam
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libX11-devel
 BuildRequires:  pam-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXpm-devel
+BuildRequires:  cairo-devel
+BuildRequires:  libev-devel
+BuildRequires:  libxcb-devel
+BuildRequires:  xcb-util-keysyms-devel
+BuildRequires:  xcb-util-image-devel
 
 
 %description
@@ -34,16 +31,17 @@ resuming from suspend, at least sometimes.
 
 
 %prep
-%setup -q -n %{name}
+%setup -q
 
 sed \
-    -e 's|CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}|CFLAGS = -std=c99 -pedantic %{optflags} ${INCS} ${CPPFLAGS}|g' \
-    -e 's|LDFLAGS = -s ${LIBS}|LDFLAGS = ${LIBS}|g' \
-    -i config.mk
+    -e 's|PREFIX=/usr|PREFIX=%{_prefix}|g' \
+    -e 's|SYSCONFDIR=/etc|SYSCONFDIR=%{_sysconfdir}|g' \
+    -i Makefile
 
 
 %build
-make %{?_smp_mflags}
+# we have to add libev cflags because the Makefile doesn't list them
+CFLAGS="%{optflags} `pkg-config --cflags libev`" make %{?_smp_mflags}
 
 
 %install
@@ -65,11 +63,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc LICENSE
 %{_bindir}/%{name}
-%{_mandir}/man*/%{name}*
 %{_sysconfdir}/pam.d/%{name}
 
 
 %changelog
+* Wed Jun 06 2012 Martin Preisler <mpreisle at redhat.com - 2.4.1-1
+- Updated to upstream stable 2.4.1 release
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-6.20100320git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 66c7a5e..529e0e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-760bcd0a78fc0f3053b6b65757c4f7f9  i3lock-1.0-20100320git.tar.bz2
+fbc954133a6335be89e394d9ec85fcfd  i3lock-2.4.1.tar.bz2