commit 5133873eab3ed6456a221caa1694da41faf57d04
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Wed Apr 10 12:33:56 2013 +0200
- add ld.conf for samba4 libdir
- updated python deps
- don't install smb.conf as it is, samba-tool provision will create one
samba4.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index 3668924..7fdf93e 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -271,6 +271,8 @@ Summary: Samba Module for Python
Group: Development/Languages/Python
%pyrequires_eq python
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: python-dns
+Requires: python-modules
Obsoletes: python-samba
%description -n python-samba4
@@ -775,7 +777,7 @@ cd pidl
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,pam.d,security,sysconfig/rc-inetd}
\
+install -d
$RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,pam.d,security,sysconfig/rc-inetd,ld.so.conf.d}
\
$RPM_BUILD_ROOT{/var/{log/archive,spool}/samba,/var/lib/samba/printing}
\
$RPM_BUILD_ROOT/var/log/samba/cores/{smbd,nmbd} \
$RPM_BUILD_ROOT{/sbin,/%{_lib}/security,%{_libdir},%{_libdir}/samba/vfs,%{_includedir},%{_sambahome},%{schemadir}}
\
@@ -815,7 +817,7 @@ cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/samba
install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/swat
cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/samba
cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/samba
-cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf.samba3
install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind
cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/winbind
@@ -835,6 +837,8 @@ touch $RPM_BUILD_ROOT/var/lib/samba/{wins.dat,browse.dat}
echo '127.0.0.1 localhost' > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
+echo "%{_libdir}/samba" >$RPM_BUILD_ROOT/etc/ld.so.conf.d/samba.conf
+
%if %{with cups}
install -d $RPM_BUILD_ROOT%{cups_serverbin}/backend
ln -s %{_bindir}/smbspool $RPM_BUILD_ROOT%{cups_serverbin}/backend/smb
@@ -1041,10 +1045,10 @@ fi
%files common
%defattr(644,root,root,755)
%doc README WHATSNEW.txt Roadmap
+/etc/ld.so.conf.d/samba.conf
%attr(755,root,root) %{_bindir}/samba-tool
%attr(755,root,root) %{_sbindir}/samba_kcc
%dir %{_sysconfdir}/samba
-%attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/samba/smb.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/lmhosts
%attr(755,root,root) %{_libdir}/libdcerpc.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libdcerpc.so.0
@@ -1539,6 +1543,7 @@ fi
%files -n samba3-common
%defattr(644,root,root,755)
+%attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/samba/smb.conf.samba3
%attr(755,root,root) %{_bindir}/eventlogadm
%attr(755,root,root) %{_bindir}/ntlm_auth
%attr(755,root,root) %{_bindir}/pdbedit
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/samba4.git/commitdiff/5133873eab3ed6456a221caa1694da41faf57d04
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
