[libpwquality/el5] epel changes

Tomáš Mráz tmraz at fedoraproject.org
Tue Dec 13 08:20:24 UTC 2011


commit 69c8d5e5bf80fbb7f21fdac0c4ebd5676ba11e13
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Tue Dec 13 09:20:21 2011 +0100

    epel changes

 libpwquality.spec |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/libpwquality.spec b/libpwquality.spec
index 5461a5d..eaa41b6 100644
--- a/libpwquality.spec
+++ b/libpwquality.spec
@@ -1,7 +1,7 @@
 Summary: A library for password generation and password quality checking
 Name: libpwquality
 Version: 1.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 # The package is BSD licensed with option to relicense as GPL+
 # - this option is redundant as the BSD license allows that anyway.
 License: BSD or GPL+
@@ -10,13 +10,20 @@ Source0: http://fedorahosted.org/releases/l/i/libpwquality/libpwquality-%{versio
 
 %global _moduledir /%{_lib}/security
 %global _secconfdir %{_sysconfdir}/security
+%if 0%{?rhel} <= 5
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+BuildRequires: cracklib
+%else
+BuildRequires: cracklib-devel
+%endif
 
 Requires: cracklib-dicts >= 2.8
 Requires: pam%{?_isa}
-BuildRequires: cracklib-devel
 BuildRequires: gettext
 BuildRequires: pam-devel
 BuildRequires: python2-devel
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 URL: http://libpwquality.fedorahosted.org/
 
@@ -65,6 +72,8 @@ pronounceable passwords from Python applications.
 make %{?_smp_mflags}
 
 %install
+rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
@@ -80,6 +89,9 @@ rm -f $RPM_BUILD_ROOT%{_moduledir}/*.la
 %check
 # Nothing yet
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -106,6 +118,9 @@ rm -f $RPM_BUILD_ROOT%{_moduledir}/*.la
 %{python_sitearch}/pwquality.so
 
 %changelog
+* 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


More information about the scm-commits mailing list