From 98ecaf881a47fb72d138562a4b451aa3499848dc Mon Sep 17 00:00:00 2001
From: Simon Wesp <cassmodiah@fedoraproject.org>
Date: Jun 15 2013 18:19:08 +0000
Subject: New upstream release


---

diff --git a/.gitignore b/.gitignore
index 80ef2b2..74fa41d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 i3lock-1.0-20100320git.tar.bz2
 /i3lock-2.4.1.tar.bz2
+/i3lock-2.5.tar.bz2
diff --git a/i3lock.pam b/i3lock.pam
deleted file mode 100644
index 2c9a3a2..0000000
--- a/i3lock.pam
+++ /dev/null
@@ -1,16 +0,0 @@
-#%PAM-1.0
-auth [user_unknown=ignore success=ok ignore=ignore default=bad] pam_securetty.so
-auth       include      system-auth
-account    required     pam_nologin.so
-account    include      system-auth
-password   include      system-auth
-# pam_selinux.so close should be the first session rule
-session    required     pam_selinux.so close
-session    required     pam_loginuid.so
-session    optional     pam_console.so
-# pam_selinux.so open should only be followed by sessions to be executed in the user context
-session    required     pam_selinux.so open
-session    required     pam_namespace.so
-session    optional     pam_keyinit.so force revoke
-session    include      system-auth
--session   optional     pam_ck_connector.so
diff --git a/i3lock.spec b/i3lock.spec
index 4f9ee2c..1a553ab 100644
--- a/i3lock.spec
+++ b/i3lock.spec
@@ -1,13 +1,12 @@
 Name:           i3lock
-Version:        2.4.1
-Release:        7%{?dist}
+Version:        2.5
+Release:        1%{?dist}
 Summary:        Simple X display locker
 
 Group:          User Interface/Desktops
 License:        MIT
 URL:            http://i3wm.org/%{name}
 Source0:        http://i3wm.org/%{name}/%{name}-%{version}.tar.bz2
-Source1:        %{name}.pam
 
 BuildRequires:  libX11-devel
 BuildRequires:  pam-devel
@@ -16,8 +15,11 @@ BuildRequires:  libXpm-devel
 BuildRequires:  cairo-devel
 BuildRequires:  libev-devel
 BuildRequires:  libxcb-devel
+BuildRequires:  libxkbcommon-devel
+BuildRequires:  libxkbfile-devel
 BuildRequires:  xcb-util-keysyms-devel
 BuildRequires:  xcb-util-image-devel
+BuildRequires:  xcb-util-devel
 
 
 %description
@@ -50,10 +52,6 @@ make install \
      DESTDIR=%{buildroot} \
      INSTALL="install -p"
 
-mkdir -p %{buildroot}/%{_sysconfdir}/pam.d/
-install -Dpm0644 %{SOURCE1} \
-        %{buildroot}/%{_sysconfdir}/pam.d/%{name}
-
 install -Dpm0644 i3lock.1.gz %{buildroot}/%{_mandir}/man1/i3lock.1.gz
 
 %clean
@@ -67,7 +65,16 @@ rm -rf %{buildroot}
 %{_sysconfdir}/pam.d/%{name}
 %{_mandir}/man1/i3lock.1.gz
 
+
 %changelog
+* Fri Jun 14 2013 Felix Wiedemann <felix.wiedemann@online.de> - 2.5-1
+- New upstream release
+- Removed custom i3lock.pam file
+- Added new BuildRequires
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 529e0e3..4317a13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fbc954133a6335be89e394d9ec85fcfd  i3lock-2.4.1.tar.bz2
+a7d4f2519deb5a62acbc755b09b4faea  i3lock-2.5.tar.bz2