diff --git a/.gitignore b/.gitignore index a672109..b6ec188 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /libpwquality-1.2.1.tar.bz2 /libpwquality-1.2.2.tar.bz2 /libpwquality-1.2.3.tar.bz2 +/libpwquality-1.2.4.tar.bz2 diff --git a/libpwquality.spec b/libpwquality.spec index a338fef..59de5ea 100644 --- a/libpwquality.spec +++ b/libpwquality.spec @@ -1,13 +1,12 @@ Summary: A library for password generation and password quality checking Name: libpwquality -Version: 1.2.3 -Release: 4%{?dist} +Version: 1.2.4 +Release: 1%{?dist} # The package is BSD licensed with option to relicense as GPLv2+ # - this option is redundant as the BSD license allows that anyway. License: BSD or GPLv2+ Group: System Environment/Base Source0: http://fedorahosted.org/releases/l/i/libpwquality/libpwquality-%{version}.tar.bz2 -Patch1: libpwquality-1.2.3-translation-updates.patch %global _pwqlibdir %{_libdir} %global _moduledir %{_libdir}/security @@ -19,11 +18,12 @@ BuildRequires: cracklib-devel BuildRequires: gettext BuildRequires: pam-devel BuildRequires: python2-devel +BuildRequires: python3-devel URL: http://libpwquality.fedorahosted.org/ # we don't want to provide private python extension libs -%define __provides_exclude_from ^%{python_sitearch}/.*\.so$. +%define __provides_exclude_from ^(%{python_sitearch}|%{python3_sitearch})/.*\.so$. %description This is a library for password quality checks and generation @@ -53,22 +53,49 @@ for the libpwquality library. These bindings can be used for easy password quality checking and generation of random pronounceable passwords from Python applications. +%package -n python3-pwquality +Group: Development/Libraries +Summary: Python bindings for the libpwquality library +Requires: libpwquality%{?_isa} = %{version}-%{release} + +%description -n python3-pwquality +This is pwquality Python module that provides Python bindings +for the libpwquality library. These bindings can be used +for easy password quality checking and generation of random +pronounceable passwords from Python applications. + %prep %setup -q -%patch1 -p2 -b .translations + +rm -rf %{py3dir} +cp -a . %{py3dir} %build %configure \ --with-securedir=%{_moduledir} \ --with-pythonsitedir=%{python_sitearch} \ + --with-python-binary=%{__python2} \ --disable-static -make -C po update-gmo make %{?_smp_mflags} +pushd %{py3dir} +%configure \ + --with-securedir=%{_moduledir} \ + --with-pythonsitedir=%{python3_sitearch} \ + --with-python-binary=%{__python3} \ + --disable-static + +make %{?_smp_mflags} +popd + %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +pushd %{py3dir} +make -C python install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' +popd + %if "%{_pwqlibdir}" != "%{_libdir}" pushd $RPM_BUILD_ROOT%{_libdir} mv libpwquality.so.* $RPM_BUILD_ROOT%{_pwqlibdir} @@ -110,16 +137,17 @@ rm -f $RPM_BUILD_ROOT%{_moduledir}/*.la %files -n python-pwquality %defattr(-,root,root,-) %{python_sitearch}/pwquality.so +%{python_sitearch}/*.egg-info -%changelog -* Fri Jul 18 2014 Tom Callaway - 1.2.3-4 -- fix license handling - -* Sat Jun 07 2014 Fedora Release Engineering - 1.2.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild +%files -n python3-pwquality +%defattr(-,root,root,-) +%{python3_sitearch}/*.so +%{python3_sitearch}/*.egg-info -* Fri Nov 29 2013 Tomáš Mráz 1.2.3-2 -- translation updates +%changelog +* Wed Aug 6 2014 Tomáš Mráz 1.2.4-1 +- fix license handling (by Tom Callaway) +- add Python3 module subpackage * Thu Sep 12 2013 Tomáš Mráz 1.2.3-1 - fix problem with parsing the pam_pwquality options diff --git a/sources b/sources index 275c249..e127a7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8d4cf5d40a1c301f965432e6f3b821b libpwquality-1.2.3.tar.bz2 +5c8b1d984a9c184fc62a4d07bb36b922 libpwquality-1.2.4.tar.bz2