[pam_passwdqc/f13/master] - Fixed issues as per bz 226226, patch by Parag (panemade at gmail.com). - Added explanation for extra

[avesh agarwal]

commit a50ddd3ff89989df57d91e04a8452efd08276b51
Author: Avesh Agarwal <avagarwa at redhat.com>
Date:   Tue Sep 7 13:10:47 2010 -0400

    - Fixed issues as per bz 226226, patch by Parag (panemade at gmail.com).
    - Added explanation for extra C flags as per fedora guidelines.
    - Modified %files section to include "-" as per guidelines.
    - Added explanation for adding extra flags.
    - Removed buildroot tag.
    - Fixed license, and source urls.

 pam_passwdqc.spec |   33 ++++++++++++++++++---------------
 1 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/pam_passwdqc.spec b/pam_passwdqc.spec
index 485ccfe..9e4f7f6 100644
--- a/pam_passwdqc.spec
+++ b/pam_passwdqc.spec
@@ -1,16 +1,15 @@
 Summary: Pluggable password quality-control module
 Name: pam_passwdqc
 Version: 1.0.5
-Release: 6%{?dist}
-# License of man page is BSD, rest is Copyright only
-License: BSD and Copyright only
+Release: 7%{?dist}
+# License of man page is BSD, wordset_4k.c is public domain 
+# and rest is Copyright only
+License: BSD and Public Domain and Copyright only
 Group: System Environment/Base
 URL: http://www.openwall.com/passwdqc/
-Source0: ftp://ftp.openwall.com/pub/projects/pam/modules/%name/%name-%version.tar.gz
-Source1: ftp://ftp.openwall.com/pub/projects/pam/modules/%name/%name-%version.tar.gz.sign
+Source0: ftp://ftp.openwall.com/pub/projects/pam/modules/%{name}/%{name}-%{version}.tar.gz
+Source1: ftp://ftp.openwall.com/pub/projects/pam/modules/%{name}/%{name}-%{version}.tar.gz.sign
 BuildRequires: pam-devel
-BuildRoot: %{_tmppath}/%name-%version
-
 Patch1: patch-219201.patch 
 
 %description
@@ -22,26 +21,30 @@ and can be (re-)configured without rebuilding.
 
 %prep
 %setup -q
-
 %patch1 -p1
 
 %build
-make CFLAGS="-Wall -fPIC -DHAVE_SHADOW -DLINUX_PAM $RPM_OPT_FLAGS" LDFLAGS_LINUX='--shared -Wl,--version-script,$(MAP)'
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+#extra C flags (in addition to RPM_OPT_FLAGS) are for creating pam_passwdqc as a shared library, and for enabling all warnings
+make CFLAGS="-Wall -fPIC -DHAVE_SHADOW -DLINUX_PAM $RPM_OPT_FLAGS" LDFLAGS_LINUX='--shared -Wl,--version-script,$(MAP)' %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} SECUREDIR=/%{_lib}/security
+make install DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} SECUREDIR=/%{_lib}/security INSTALL="install -p"
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc LICENSE README
 /%{_lib}/security/pam_passwdqc.so
 %{_mandir}/man*/*
 
 %changelog
+* Tue Sep 7 2010 Avesh Agarwal <avagarwa at redhat.com> - 1.0.5-7
+- Fixed issues as per bz 226226, patch by Parag (panemade at gmail.com).
+- Added explanation for extra C flags as per fedora guidelines.
+- Modified %files section to include "-" as per guidelines.
+- Added explanation for adding extra flags.
+- Removed buildroot tag.
+- Fixed license, and source urls.
+
 * Tue Jan 12 2010 Avesh Agarwal <avagarwa at redhat.com> - 1.0.5-6
 - Fixed following rpmlint errors on src rpm:
   pam_passwdqc.src: W: summary-ended-with-dot Pluggable