- libffi rebuild

[packages/libuser.git] / libuser.spec

diff --git a/libuser.spec b/libuser.spec
index 116f84c28728a16be049a0cac2541deb36eadb6d..dd0ad808899adc954298ff1c007fbff2578c0693 100644 (file)
--- a/libuser.spec
+++ b/libuser.spec
@@ -1,14 +1,22 @@
+# TODO
+# - tests need local ldap running (should start own copy of daemon instead)
+#
+# Conditional build:
+%bcond_with    tests   # do not perform "make test"
+
 Summary:       A user and group account administration library
 Summary(pl.UTF-8):     Biblioteka do administrowania kontami użytkowników i grup
 Name:          libuser
-Version:       0.56.6
-Release:       1
+Version:       0.60
+Release:       2
 License:       LGPL v2+
-Group:         Applications/System
-Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: 74bd4ad52d81ccf67a8f6cd110add809
-Patch0:                %{name}-selinux.patch
+Group:         Base
+Source0:       https://fedorahosted.org/releases/l/i/libuser/%{name}-%{version}.tar.xz
+# Source0-md5: 5c549724999ccca65ceaaecc4eb8cb98
+Patch0:                format-security.patch
+URL:           https://fedorahosted.org/libuser/
 BuildRequires: cyrus-sasl-devel
+BuildRequires: gettext-devel >= 0.17
 BuildRequires: glib2-devel >= 2.0
 BuildRequires: libselinux-devel
 BuildRequires: openldap-devel
@@ -16,6 +24,13 @@ BuildRequires:       pam-devel
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
 BuildRequires: python-devel
+BuildRequires: sgml-tools
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
+%if %{with tests}
+BuildRequires: openldap
+BuildRequires: openldap-servers
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -68,28 +83,30 @@ i grup.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1
 
 %build
 %configure \
+       NSCD=/usr/sbin/nscd \
        --with-selinux \
        --with-ldap \
        --with-html-dir=%{_gtkdocdir}
 %{__make}
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
-rm $RPM_BUILD_ROOT%{py_sitedir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/*.la
 
 %find_lang %{name}
 
 %clean
-rm -fr $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
 
 %post  -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -103,9 +120,9 @@ rm -fr $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libuser.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libuser.so.1
 %dir %{_libdir}/%{name}
-%{_libdir}/%{name}/libuser_files.so
-%{_libdir}/%{name}/libuser_ldap.so
-%{_libdir}/%{name}/libuser_shadow.so
+%attr(755,root,root) %{_libdir}/%{name}/libuser_files.so
+%attr(755,root,root) %{_libdir}/%{name}/libuser_ldap.so
+%attr(755,root,root) %{_libdir}/%{name}/libuser_shadow.so
 %attr(755,root,root) %{_sbindir}/lchage
 %attr(755,root,root) %{_sbindir}/lgroupadd
 %attr(755,root,root) %{_sbindir}/lgroupdel