- all bconds fixed.

[packages/cracklib.git] / cracklib.spec

diff --git a/cracklib.spec b/cracklib.spec
index 723baee0027c8f6e3838bb54cb0ef399b0c6a7c6..eed5e53a9dbb96af8aed0e98a47693808c379952 100644 (file)
--- a/cracklib.spec
+++ b/cracklib.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_with    ssp     # disable stack-smashing protector (vide dietlibc.spec)
+#
 Summary:       Password checking library
 Summary(es):   Biblioteca de chequeo de contraseñas
 Summary(fr):   Bibliothèque de vérification de mots de passe
@@ -8,7 +12,7 @@ Summary(tr):   Parola denetim kitapl
 Summary(uk):   â¦Â̦ÏÔÅËÁ ÐÅÒÅצÒËÉ ÐÁÒÏ̦×
 Name:          cracklib
 Version:       2.7
-Release:       17
+Release:       18
 License:       Artistic
 Group:         Libraries
 Source0:       ftp://coast.cs.purdue.edu/pub/tools/unix/libs/cracklib/%{name}_%{version}.tgz
@@ -16,6 +20,7 @@ Source0:      ftp://coast.cs.purdue.edu/pub/tools/unix/libs/cracklib/%{name}_%{versio
 Patch0:                %{name}.patch
 Patch1:                %{name}-pld.patch
 Patch2:                %{name}-nss.patch
+Patch3:                %{name}-libdir.patch
 BuildRequires: words
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -176,17 +181,19 @@ s
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__make} all \
        CC="%{__cc}" \
-       OPTFLAGS="%{rpmcflags}"
+       OPTFLAGS="%{rpmcflags} %{?with_ssp:-fno-stack-protector}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_libdir},%{_includedir},%{_datadir}/dict}
 
 %{__make} install \
+       libdir=%{_libdir} \
        ROOT=$RPM_BUILD_ROOT
 
 install cracklib/packer.h $RPM_BUILD_ROOT%{_includedir}