commit fa56ac48419b87cac96340bd1cd2b2f99f9f8bd6
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun May 1 16:58:58 2016 +0200
- use system subunit
samba.spec | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/samba.spec b/samba.spec
index ecefdb2..3a420d6 100644
--- a/samba.spec
+++ b/samba.spec
@@ -87,6 +87,7 @@ BuildRequires: popt-devel
BuildRequires: python-devel >= 1:2.5.0
BuildRequires: python-dns
BuildRequires: python-modules >= 1:2.5.0
+BuildRequires: python-subunit
BuildRequires: python-testtools
BuildRequires: readline-devel >= 4.2
BuildRequires: rpm-perlprov
@@ -94,6 +95,7 @@ BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.647
BuildRequires: sed >= 4.0
BuildRequires: socket_wrapper >= 1.1.2
+BuildRequires: subunit-devel
%{?with_systemd:BuildRequires: systemd-devel}
BuildRequires: xfsprogs-devel
BuildRequires: zlib-devel >= 1.2.3
@@ -529,7 +531,7 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
--disable-rpath \
--disable-rpath-install \
--builtin-libraries=replace,ccan,samba-cluster-support \
-
--bundled-libraries=NONE,subunit,iniparser,%{!?with_system_libs:talloc,tdb,ldb,ntdb,tevent,pytalloc,pytalloc-util,pytdb,pytevent,pyldb,pyldb-util},%{!?with_system_heimdal:roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,com_err,compile_et,asn1_compile}
\
+
--bundled-libraries=NONE,iniparser,%{!?with_system_libs:talloc,tdb,ldb,ntdb,tevent,pytalloc,pytalloc-util,pytdb,pytevent,pyldb,pyldb-util},%{!?with_system_heimdal:roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,com_err,compile_et,asn1_compile}
\
--with-shared-modules=idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_rid,idmap_tdb2,auth_samba4,vfs_dfs_samba4
\
--with-cluster-support \
--with-acl-support \
@@ -1416,10 +1418,6 @@ fi
%attr(755,root,root) %{py_sitedir}/samba/dcerpc/*.so
%dir %{py_sitedir}/samba/external
%{py_sitedir}/samba/external/*.py[co]
-%dir %{py_sitedir}/samba/external/subunit
-%{py_sitedir}/samba/external/subunit/*.py[co]
-%dir %{py_sitedir}/samba/external/subunit/tests
-%{py_sitedir}/samba/external/subunit/tests/*.py[co]
%dir %{py_sitedir}/samba/netcmd
%{py_sitedir}/samba/netcmd/*.py[co]
%dir %{py_sitedir}/samba/provision
@@ -1455,7 +1453,6 @@ fi
%attr(755,root,root) %{_bindir}/smbtorture
%attr(755,root,root) %{_libdir}/libtorture.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libtorture.so.0
-%attr(755,root,root) %{_libdir}/samba/libsubunit-samba4.so
%attr(755,root,root) %{_libdir}/samba/libdlz-bind9-for-torture-samba4.so
%{_mandir}/man1/gentest.1*
%{_mandir}/man1/locktest.1*
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/samba.git/commitdiff/fa56ac48419b87cac96340bd1cd2b2f99f9f8bd6
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
