From 4e98afbd9f53f402e04d2051dd4d2d2454a1aea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= <tmraz@fedoraproject.org>
Date: Fri, 14 Jul 2006 14:59:59 +0000
Subject: [PATCH] - merged audit patch to upstream cvs - improved passwd -S
 output (#170344) - make passwd -d work with stripped down proc (#196851) -
 corrected link to pam docs (#193084) - spec file cleanups

---
 .cvsignore  |  2 +-
 passwd.spec | 29 +++++++++++++++++------------
 sources     |  2 +-
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index e3d347d..18d8665 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-passwd-0.71.tar.bz2
+passwd-0.72.tar.bz2
diff --git a/passwd.spec b/passwd.spec
index f35e839..14829a7 100644
--- a/passwd.spec
+++ b/passwd.spec
@@ -4,25 +4,24 @@
 %if %{?WITH_AUDIT:0}%{!?WITH_AUDIT:1}
 %define WITH_AUDIT 1
 %endif
-Summary: The passwd utility for setting/changing passwords using PAM.
+Summary: The passwd utility for setting/changing passwords using PAM
 Name: passwd
-Version: 0.71
-Release: 3.2.1
+Version: 0.72
+Release: 1
 License: BSD
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.bz2
-Patch1: passwd-0.71-audit.patch
 Buildroot: %{_tmppath}/passwd-root
 Requires: pam >= 0.78, /etc/pam.d/system-auth, 
 %if %{WITH_SELINUX}
-BuildPrereq: glib2-devel, libuser-devel, pam-devel, libselinux-devel
-BuildPrereq: libuser >= 0.53-1
+BuildRequires: glib2-devel, libuser-devel, pam-devel, libselinux-devel
+BuildRequires: libuser >= 0.53-1
 %else
-BuildPrereq: glib2-devel, libuser-devel, pam-devel, libuser >= 0.53-1
+BuildRequires: glib2-devel, libuser-devel, pam-devel, libuser >= 0.53-1
 %endif
 %if %{WITH_AUDIT}
-BuildPrereq: audit-libs-devel >= 1.1.2
-Requires: audit-libs >= 1.1.2
+BuildRequires: audit-libs-devel >= 1.0.14
+Requires: audit-libs >= 1.0.14
 %endif
 
 %description
@@ -34,7 +33,6 @@ To use passwd, you should have PAM installed on your system.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1
 
 %build
 %configure
@@ -54,11 +52,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%config /etc/pam.d/passwd
-%attr(4511,root,root) %{_bindir}/passwd
+%config(noreplace) /etc/pam.d/passwd
+%attr(4755,root,root) %{_bindir}/passwd
 %{_mandir}/man1/passwd.1*
 
 %changelog
+* Fri Jul 14 2006 Tomas Mraz <tmraz@redhat.com> 0.72-1
+- merged audit patch to upstream cvs
+- improved passwd -S output (#170344)
+- make passwd -d work with stripped down proc (#196851)
+- corrected link to pam docs (#193084)
+- spec file cleanups
+
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.71-3.2.1
 - rebuild
 
diff --git a/sources b/sources
index 4e454f3..dfd4f5c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02ec90cdf843d558de677fe2be22de3d  passwd-0.71.tar.bz2
+26438e7f37b2a60fb012d6e8fb345848  passwd-0.72.tar.bz2