commit f13756af74ee24307990b8fa86fddc16d6387624
Author: Jakub Bogusz <[email protected]>
Date: Thu Nov 5 21:45:24 2015 +0100
- added passwdqc bcond (mutually exclusive with pwquality)
cryptsetup.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/cryptsetup.spec b/cryptsetup.spec
index b1f7342..4babf40 100644
--- a/cryptsetup.spec
+++ b/cryptsetup.spec
@@ -2,7 +2,8 @@
# Conditonal build:
%bcond_with initrd # don't build initrd version
%bcond_with dietlibc # build initrd version with static glibc
instead of dietlibc
-%bcond_with pwquality # password quality checking
+%bcond_with passwdqc # password quality checking via libpasswdqc
[conflicts with pwquality]
+%bcond_with pwquality # password quality checking via libpwquality
[conflicts with passwdqc]
%bcond_without python # Python binding
%bcond_without tests # "make check" run
@@ -28,6 +29,7 @@ BuildRequires: libselinux-devel
BuildRequires: libsepol-devel
BuildRequires: libtool >= 2:2.0
BuildRequires: libuuid-devel
+%{?with_passwdqc:BuildRequires: passwdqc-devel}
BuildRequires: pkgconfig
BuildRequires: popt-devel >= 1.7
%if %{with python}
@@ -203,8 +205,9 @@ mv src/cryptsetup cryptsetup-initrd
--enable-udev \
--disable-silent-rules \
--enable-static \
- %{?with_python:--enable-python} \
- %{?with_pwquality:--with-pwquality}
+ %{?with_passwdqc:--enable-passwdqc=/etc/passwdqc.conf} \
+ %{?with_pwquality:--enable-pwquality} \
+ %{?with_python:--enable-python}
%{__make}
%{?with_tests:%{__make} check}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cryptsetup.git/commitdiff/f13756af74ee24307990b8fa86fddc16d6387624
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
