- release 4 (by relup.sh)

[packages/pwdutils.git] / pwdutils.spec

diff --git a/pwdutils.spec b/pwdutils.spec
index 06717251fe5677a6a0e5d8345d676648787a5a3d..f6c81148df1eeebb23cffb79ffe8e9527785b536 100644 (file)
--- a/pwdutils.spec
+++ b/pwdutils.spec
@@ -3,6 +3,7 @@
 %bcond_without audit           # don't build audit log plugin
 %bcond_without ldap            # build without LDAP support
 %bcond_without selinux         # build without SELinux support
+%bcond_without xcrypt          # crypt() from libxcrypt
 %bcond_with    bioapi          # with BioAPI support in passwd
 %bcond_with    gnutls          # use GnuTLS instead of OpenSSL
 
@@ -10,7 +11,7 @@ Summary:      Utilities to manage the passwd and shadow user information
 Summary(pl.UTF-8):     Narzędzia do zarządzania informacjami o użytkownikach z passwd i shadow
 Name:          pwdutils
 Version:       3.2.19
-Release:       2
+Release:       4
 License:       GPL v2
 Group:         Base
 #Source0:      ftp://ftp.kernel.org/pub/linux/utils/net/NIS/%{name}-%{version}.tar.bz2
@@ -46,8 +47,8 @@ BuildRequires:        gettext-tools
 BuildRequires: libnscd-devel
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
-BuildRequires: libxcrypt-devel
-%{?with_ldap:BuildRequires:    openldap-devel >= 2.4.6}
+%{?with_xcrypt:BuildRequires:  libxcrypt-devel}
+%{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
 BuildRequires: openslp-devel
 %{!?with_gnutls:BuildRequires: openssl-devel >= 0.9.7d}
 BuildRequires: pam-devel
@@ -193,8 +194,7 @@ funkcjonalność tylko dla jednej grupy zarządzania PAM: zmiany haseł.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pwdutils,security,skel/{etc,tmp}}
-
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pwdutils,security,skel/tmp}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -256,7 +256,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/login.defs
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/chfn.allow
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/chsh.allow
-%dir /etc/skel
 %dir %config(missingok) %attr(700,root,root) /etc/skel/tmp
 %attr(755,root,root) %{_bindir}/chage
 %attr(4755,root,root) %{_bindir}/chfn