This commit was manufactured by cvs2git to create tag 'AC-STABLE'.

[packages/pwdutils.git] / pwdutils.spec

diff --git a/pwdutils.spec b/pwdutils.spec
index b2857789bbde3591ba0c796e29119d645af623a2..af16103630e5aa1680749e13c828114715deb8b9 100644 (file)
--- a/pwdutils.spec
+++ b/pwdutils.spec
@@ -5,17 +5,18 @@
 %bcond_without audit           # don't build audit log plugin
 %bcond_without ldap            # build without LDAP support
 %bcond_without selinux         # build without SELinux support
+%bcond_with    bioapi          # with BioAPI support in passwd
 %bcond_with    gnutls          # use GnuTLS instead of OpenSSL
 #
 Summary:       Utilities to manage the passwd and shadow user information
 Summary(pl):   Narzêdzia do zarz±dzania informacjami o u¿ytkownikach z passwd i shadow
 Name:          pwdutils
-Version:       3.0.7
+Version:       3.1.2
 Release:       2
 License:       GPL v2
 Group:         Applications/System
 Source0:       ftp://ftp.kernel.org/pub/linux/utils/net/NIS/%{name}-%{version}.tar.bz2
-# Source0-md5: f47515d9ac7bedf4adce72fbb056f9be
+# Source0-md5: 554bfc1b91a02e93b9514fbe18682d9d
 Source1:       %{name}.useradd
 Source2:       %{name}.rpasswdd.init
 Source3:       %{name}.login.defs
@@ -33,6 +34,7 @@ URL:          http://www.thkukuk.de/pam/pwdutils/
 %{?with_audit:BuildRequires:   audit-libs-devel}
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.7
+%{?with_bioapi:BuildRequires:  bioapi-devel}
 BuildRequires: gcc >= 5:3.2
 BuildRequires: gettext-devel
 %{?with_gnutls:BuildRequires:  gnutls-devel >= 1.0.0}
@@ -40,9 +42,10 @@ BuildRequires:       libnscd-devel
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
-%{!?with_gnutls:BuildRequires: openssl-devel >= 0.9.7d}
 BuildRequires: openslp-devel
+%{!?with_gnutls:BuildRequires: openssl-devel >= 0.9.7d}
 BuildRequires: pam-devel
+BuildRequires: rpmbuild(macros) >= 1.268
 BuildRequires: sed >= 4.0
 Provides:      shadow = 2:%{version}-%{release}
 Provides:      shadow-extras = 2:%{version}-%{release}
@@ -111,8 +114,8 @@ wywo
 Summary:       Remote password update daemon
 Summary(pl):   Demon do zdalnego uaktualniania hase³
 Group:         Applications/System
-Requires:      rc-scripts
 Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts
 
 %description -n rpasswdd
 rpasswdd is a daemon that lets users change their passwords in the
@@ -155,6 +158,8 @@ funkcjonalno
 
 sed -i -e 's/-Werror //' configure.in
 
+rm -f po/stamp-po
+
 %build
 %{__gettextize}
 %{__aclocal}
@@ -162,6 +167,8 @@ sed -i -e 's/-Werror //' configure.in
 %{__autoheader}
 %{__automake}
 %configure \
+       %{?with_bioapi:CPPFLAGS="-I/usr/include/bioapi"} \
+       %{!?with_bioapi:ac_cv_header_bioapi_h=no ac_cv_lib_bioapi100_BioAPI_Init=no} \
        %{?with_audit:--enable-audit-plugin} \
        %{!?with_gnutls:--disable-gnutls} \
        --%{?with_ldap:en}%{!?with_ldap:dis}able-ldap \
@@ -174,7 +181,7 @@ sed -i -e 's/-Werror //' configure.in
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pwdutils,security,skel}
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pwdutils,security,skel/tmp}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
@@ -210,17 +217,11 @@ fi
 
 %post -n rpasswdd
 /sbin/chkconfig --add rpasswdd
-if [ -f /var/lock/subsys/rpasswdd ]; then
-       /etc/rc.d/init.d/rpasswdd restart 1>&2
-else
-       echo "Run \"/etc/rc.d/init.d/rpasswdd start\" to start rpasswdd daemon."
-fi
+%service rpasswdd restart "rpasswdd daemon"
 
 %preun -n rpasswdd
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/rpasswdd ]; then
-               /etc/rc.d/init.d/rpasswdd stop 1>&2
-       fi
+       %service rpasswdd stop
        /sbin/chkconfig --del rpasswdd
 fi
 
@@ -243,6 +244,7 @@ fi
 %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 /etc/skel/tmp
 %attr(755,root,root) %{_bindir}/chage
 %attr(4755,root,root) %{_bindir}/chfn
 %attr(4755,root,root) %{_bindir}/chsh