From 4905da8cedb1457821fd41f8c67a80af0ba4aae3 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@fedoraproject.org>
Date: Sep 06 2005 20:51:55 +0000
Subject: - updated to 5.19

- upstream included a fix for (BZ #161740), but "GENTOO" needs to be
    defined during compilation

---

diff --git a/.cvsignore b/.cvsignore
index bc079f2..a0a0444 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xlockmore-5.18.tar.bz2
+xlockmore-5.19.tar.bz2
diff --git a/sources b/sources
index ca5a9e8..ba634a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-211673f6be51bdec96718b891bf9ebb9  xlockmore-5.18.tar.bz2
+c80ae7689bf8683033ec08b652e24d83  xlockmore-5.19.tar.bz2
diff --git a/xlockmore.older-passwd.patch b/xlockmore.older-passwd.patch
deleted file mode 100644
index 8816113..0000000
--- a/xlockmore.older-passwd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- xlockmore-5.18/xlock/passwd.c	2005-05-31 15:54:36.000000000 +0200
-+++ xlockmore-5.16/xlock/passwd.c	2005-02-17 02:24:50.000000000 +0100
-@@ -1218,15 +1208,10 @@
- #ifdef BAD_PAM
- 	(void) seteuid(ruid); /* back to user's privileges */
- #endif
--
--	pam_error = pam_acct_mgmt(pamh, 0);
--	if (pam_error == PAM_NEW_AUTHTOK_REQD)
--		pam_error = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
--	PAM_BAIL;
--
--	pam_error = pam_setcred(pamh, PAM_REINITIALIZE_CRED);
--	PAM_BAIL;
--
-+	/* Do not do account management or credentials; credentials
-+	 * are not needed and account management would just lock up
-+	 * a computer and require root to come and unlock it.  Blech.
-+	 */
- 	pam_end(pamh, PAM_SUCCESS);
- 	/* If this point is reached, the user has been authenticated. */
- 	done = True;
diff --git a/xlockmore.spec b/xlockmore.spec
index c9e7291..81d2a9d 100644
--- a/xlockmore.spec
+++ b/xlockmore.spec
@@ -1,12 +1,11 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.18
-Release: 3%{?dist}
+Version: 5.19
+Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.18.tar.bz2
-Patch0: xlockmore.older-passwd.patch
+Source0: http://www.tux.org/~bagleyd/latest/xlockmore-5.19.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU
@@ -34,14 +33,13 @@ GTK based frontend for xlockmore.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
 %build
 %configure \
 	--with-crypt --enable-pam --enable-syslog --disable-setuid
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} CFLAGS+=" -DGENTOO "
 
 %install
 %{__rm} -rf %{buildroot}
@@ -106,6 +104,11 @@ desktop-file-install \
 %{_bindir}/xglock
 
 %changelog
+* Sun Aug 21 2005 Adrian Reber <adrian@lisas.de> - 5.19-1
+- updated to 5.19
+- upstream included a fix for (BZ #161740), but "GENTOO" needs
+  to be defined during compilation
+
 * Mon Jun 27 2005 Adrian Reber <adrian@lisas.de> - 5.18-3
 - included patch to make it work again with PAM (BZ #161740)