scabrero/samba
SHA256
1
0
Fork 0
forked from pool/samba
Code Pull Requests Activity

Add /etc/sysconfig/samba to the main and winbind package; (bnc#857454).

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=360
This commit is contained in:
Lars Müller 2014-01-06 17:19:21 +00:00 committed by Git OBS Bridge
parent 3e4c02b2ab
commit fdb5c2c2f1
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:53d61b21f0629595db21720d714e1943561d5a63238a7227181a05f5c1082327 oid sha256:d3897b559867fa617bb643ab2f1fb172543b74ed541ff5da753359f4c0c18589
size 71356 size 71327

5
samba.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 6 17:12:55 UTC 2014 - lmuelle@suse.com
- Add /etc/sysconfig/samba to the main and winbind package; (bnc#857454).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jan 6 13:09:35 UTC 2014 - lmuelle@suse.com Mon Jan 6 13:09:35 UTC 2014 - lmuelle@suse.com

20
samba.spec
View File

@ -135,7 +135,7 @@ BuildRequires: systemd
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define SOURCE_TIMESTAMP 3136 %define SOURCE_TIMESTAMP 3137
%define BRANCH %{version} %define BRANCH %{version}
%global with_mitkrb5 1 %global with_mitkrb5 1
%global with_dc 0 %global with_dc 0
@ -1355,8 +1355,18 @@ for srv_name in nmb smb winbind; do
-e 's@Type=forking@Type=forking\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' \ -e 's@Type=forking@Type=forking\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' \
../packaging/systemd/${srv_name}.service \ ../packaging/systemd/${srv_name}.service \
>%{buildroot}/%{_unitdir}/${srv_name}.service >%{buildroot}/%{_unitdir}/${srv_name}.service
echo -en "## Type: string
## Default: \"\"
## ServiceRestart:·${srv_name}
${srv_name^^}OPTIONS=\"\"\n" >>SUSE.sysconfig.${srv_name}
ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name} ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name}
done done
head -n 2 ../packaging/systemd/samba.sysconfig > \
%{buildroot}%_var/adm/fillup-templates/sysconfig.samba
cat SUSE.sysconfig.{nmb,smb} >>\
%{buildroot}%_var/adm/fillup-templates/sysconfig.samba
cp -a SUSE.sysconfig.winbind \
%{buildroot}%_var/adm/fillup-templates/sysconfig.samba-winbind
install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d
install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}%{_prefix}/lib/tmpfiles.d/samba.conf install -m 0644 -p ../packaging/systemd/samba.conf.tmp %{buildroot}%{_prefix}/lib/tmpfiles.d/samba.conf
%else %else
@ -1513,6 +1523,7 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || :
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
%service_add_post nmb.service smb.service %service_add_post nmb.service smb.service
%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf %{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
%fillup_only
%endif %endif
%postun %postun
@ -1693,6 +1704,7 @@ fi
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
%service_add_post winbind.service %service_add_post winbind.service
%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf %{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
%fillup_only -a
%endif %endif
%preun winbind %preun winbind
@ -1829,6 +1841,9 @@ fi
%endif %endif
%exclude %{_mandir}/man8/samba-tool.8.* %exclude %{_mandir}/man8/samba-tool.8.*
%exclude %{_mandir}/man8/samba.8.* %exclude %{_mandir}/man8/samba.8.*
%if 0%{?suse_version} > 1220
%{_var}/adm/fillup-templates/sysconfig.samba
%endif
%files client %files client
%defattr(-,root,root) %defattr(-,root,root)
@ -2172,6 +2187,9 @@ fi
%endif %endif
%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/winbind.xml %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/winbind.xml
%attr(0750,root,winbind) %dir %{LOCKDIR}/winbindd_privileged %attr(0750,root,winbind) %dir %{LOCKDIR}/winbindd_privileged
%if 0%{?suse_version} > 1220
%{_var}/adm/fillup-templates/sysconfig.samba-winbind
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
%files doc -f filelist-samba-doc %files doc -f filelist-samba-doc

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:261b3e0d258e6b201212ffae6eed9f51ba59f63afc6b3659f50d15f50e35c568 oid sha256:ef0c8ae8340aa1f4d5553f2370b691ae1acff8864e209a8fc8098fc05a2737a7
size 54151 size 54140