--- rpms/pwauth/sme9/pwauth.spec	2013/05/21 15:09:44	1.2
+++ rpms/pwauth/sme9/pwauth.spec	2013/06/05 03:54:10	1.3
@@ -1,6 +1,8 @@
+%global _hardened_build 1
+
 Name:           pwauth
 Version:        2.3.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        External plugin for mod_authnz_external authenticator
 
 Group:          Applications/System
@@ -8,9 +10,10 @@ License:        BSD
 URL:            http://code.google.com/p/pwauth/
 Source0:        http://pwauth.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:        pwauth.pam
-Patch1:         pwauth-strchr.patch
-Patch2:         pwauth-config.patch
-
+Patch1:         pwauth-make.patch
+Patch2:         pwauth-strchr.patch
+Patch3:         pwauth-cleanup.patch
+Patch100:       pwauth-config.patch
 BuildRequires:  pam-devel
 Requires(pre):  httpd, perl
 
@@ -24,22 +27,16 @@ versions of Unix.
 %prep
 %setup -q
 
-%patch1 -p1 -b .strchr
-%patch2 -p1 -b .config
+%patch1 -p1 -b .make
+%patch2 -p1 -b .strchr
+%patch3 -p1 -b .cleanup
+%patch100 -p1 -b .config
 
 %build
-sed -i.orig -r \
-    -e 's@^#define SHADOW_@/* &@' \
-    -e 's@^/\* (#define PAM[^_])@\1@' \
-    -e 's@^(#define (NOLOGIN_FILE|MIN_NOLOGIN_UID|SERVER_UIDS))@/* \1@' \
-    config.h
-
-sed -i.orig -r \
-    -e 's@^# (LIB=-lpam -ldl)@\1@' \
-    -e 's@^CFLAGS= \$\(LOCALFLAGS\)@# &@' \
-    Makefile
+export CFLAGS="${RPM_OPT_FLAGS}"
+export LDFLAGS="${RPM_LD_FLAGS}"
 
-make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS} -Wno-comment"
+make %{?_smp_mflags} CFLAGS="${CFLAGS} -Wno-comment" LDFLAGS="${LDFLAGS}"
 
 
 %install
@@ -62,6 +59,14 @@ install -p -T %{SOURCE1} %{buildroot}%{_
 
 
 %changelog
+* Tue Jun 4 2013 Ian Wells <esmith@wellsi.com> 2.3.10-5.sme
+- Apply SME Server config file changes [SME: 7654]
+
+* Tue May 21 2013 Philip Prindeville <philipp@fedoraproject.org> 2.3.10-5
+- Fix for bz#965461
+- Get rid of some of the more worrisome compiler warnings.
+- Use patch instead of sed to modify Makefile.
+
 * Fri Mar 22 2013 Philip Prindeville <philipp@fedoraproject.org> 2.3.10-4
 - Fix for bz#924881