[libpwquality/el6: 5/5] Merge branch 'master' into el6

[Tomáš Mráz]

commit bfff7e121d3b2aae0db3c52f71033348dce4212b
Merge: 9c0d14a 0657c14
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Wed Jun 13 17:27:40 2012 +0200

    Merge branch 'master' into el6
    
    Conflicts:
    	libpwquality.spec

 .gitignore        |    2 ++
 libpwquality.spec |   30 ++++++++++++++++++------------
 sources           |    2 +-
 3 files changed, 21 insertions(+), 13 deletions(-)
---
diff --cc libpwquality.spec
index 91d00a1,570d8f2..11e7af5
--- a/libpwquality.spec
+++ b/libpwquality.spec
@@@ -28,12 -20,9 +28,6 @@@ BuildRoot: %(mktemp -ud %{_tmppath}/%{n
  
  URL: http://libpwquality.fedorahosted.org/
  
--# we don't want to provide private python extension libs
- %{?filter_setup:
- %filter_provides_in %{python_sitearch}/.*\.so$.
- %filter_setup
- }
- 
 -%define __provides_exclude_from ^%{python_sitearch}/.*\.so$.
 -
  %description
  This is a library for password quality checks and generation
  of random passwords that pass the checks.
@@@ -74,16 -63,13 +69,15 @@@ pronounceable passwords from Python app
  make %{?_smp_mflags}
  
  %install
 +rm -rf $RPM_BUILD_ROOT
 +
  make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
  
- mkdir -p $RPM_BUILD_ROOT%{_libdir}
  pushd $RPM_BUILD_ROOT%{_libdir}
+ mv libpwquality.so.* $RPM_BUILD_ROOT/%{_lib}/
  ln -sf ../../%{_lib}/libpwquality.so.*.* libpwquality.so
  popd
- rm -f $RPM_BUILD_ROOT/%{_lib}/*.so
- rm -f $RPM_BUILD_ROOT/%{_lib}/*.la
+ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
  rm -f $RPM_BUILD_ROOT%{_moduledir}/*.la
  
  %find_lang libpwquality
@@@ -120,12 -104,17 +115,23 @@@ rm -rf $RPM_BUILD_ROO
  %{python_sitearch}/pwquality.so
  
  %changelog
+ * Wed Jun 13 2012 Tomas Mraz <tmraz at redhat.com> 1.1.1-1
+ - use rpm built-in filtering of provides (rhbz#830153)
+ - remove strain debug fprintf() (rhbz#831567)
+ 
+ * Thu May 24 2012 Tomas Mraz <tmraz at redhat.com> 1.1.0-1
+ - fix leak when throwing PWQError exception
+ - added pkgconfig file
+ - call the simplicity checks before the cracklib check
+ - add enforce_for_root option to the PAM module
+ - updated translations from Transifex
+ 
 +* Mon Jan 23 2012 Tomas Mraz <tmraz at redhat.com> 1.0.0-3
 +- replace a symbol that is missing in RHEL-6 python (#783949)
 +
 +* Tue Dec 13 2011 Tomas Mraz <tmraz at redhat.com> 1.0.0-2
 +- epel changes
 +
  * Thu Dec  8 2011 Tomas Mraz <tmraz at redhat.com> 1.0.0-1
  - added a few additional password quality checks
  - bugfix in configuration file parsing