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

Revert "Add missing sysconfig file header; (bnc#947361)."

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=505
This commit is contained in:
Lars Müller 2015-09-26 17:31:40 +00:00 committed by Git OBS Bridge
parent d399675f26
commit 7d3479f4c9
4 changed files with 8 additions and 19 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:707aaae289b21abbbffd8cad202da3825215c2b07e18ddb3a2bade4bb12b6b89 oid sha256:8874bbeaca36120dfcf5ee0edc9f8b80217291f128cc6f503051d0faf3021321
size 29237 size 29242

5
samba.changes
View File

@ -3,11 +3,6 @@ Fri Sep 25 15:23:47 UTC 2015 - lmuelle@suse.com
- Relocate the tmpfiles.d directory to the client package; (bnc#947552). - Relocate the tmpfiles.d directory to the client package; (bnc#947552).
-------------------------------------------------------------------
Fri Sep 25 11:58:02 UTC 2015 - lmuelle@suse.com
- Add missing sysconfig file header; (bnc#947361).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 22 13:13:02 UTC 2015 - lmuelle@suse.com Tue Sep 22 13:13:02 UTC 2015 - lmuelle@suse.com

14
samba.spec
View File

@ -144,7 +144,7 @@ BuildRequires: systemd-devel
%else %else
%define build_make_smp_mflags %{?jobs:-j%jobs} %define build_make_smp_mflags %{?jobs:-j%jobs}
%endif %endif
%define SOURCE_TIMESTAMP 3496 %define SOURCE_TIMESTAMP 3499
%define BRANCH %{version} %define BRANCH %{version}
%global with_mitkrb5 1 %global with_mitkrb5 1
%global with_dc 0 %global with_dc 0
@ -434,7 +434,6 @@ PreReq: %{?insserv_prereq}
PreReq: /sbin/ldconfig PreReq: /sbin/ldconfig
PreReq: /usr/sbin/groupadd PreReq: /usr/sbin/groupadd
PreReq: coreutils PreReq: coreutils
PreReq: grep
PreReq: samba-client >= %{version} PreReq: samba-client >= %{version}
%description winbind %description winbind
@ -1454,10 +1453,6 @@ 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 %{_tmpfilesdir}/samba.conf %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf
grep -m 1 -q "^## Path:" %{_sysconfdir}/sysconfig/samba 2>/dev/null || ( \
cat %{_var}/adm/fillup-templates/sysconfig.samba-client %{_sysconfdir}/sysconfig/samba 2>/dev/null \
>%{_var}/adm/fillup-templates/sysconfig.samba-client.merged
mv %{_var}/adm/fillup-templates/sysconfig.samba-client.merged %{_sysconfdir}/sysconfig/samba )
%fillup_only %fillup_only
%endif %endif
@ -1529,6 +1524,9 @@ fi
if ! test -e %{_bindir}/get_printing_ticket; then if ! test -e %{_bindir}/get_printing_ticket; then
ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
fi fi
%if 0%{?suse_version} > 1220
%{fillup_only -ans samba client}
%endif
%{?fillup_only:%{fillup_only -nsd dhcp samba-client network}} %{?fillup_only:%{fillup_only -nsd dhcp samba-client network}}
%postun client %postun client
@ -1610,10 +1608,6 @@ 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 %{_tmpfilesdir}/samba.conf %{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf
grep -m 1 -q "^## Path:" %{_sysconfdir}/sysconfig/samba 2>/dev/null || ( \
cat %{_var}/adm/fillup-templates/sysconfig.samba-client %{_sysconfdir}/sysconfig/samba 2>/dev/null \
>%{_var}/adm/fillup-templates/sysconfig.samba-client.merged
mv %{_var}/adm/fillup-templates/sysconfig.samba-client.merged %{_sysconfdir}/sysconfig/samba )
%{fillup_only -ans samba winbind} %{fillup_only -ans samba winbind}
%endif %endif

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:8d3fcb88eb7ddd2b675796d1699a9b3440e6b98add2dbd2ea058d41f63dc0736 oid sha256:bd3ffa44c58b0365d5be277d10165fe28bb68a9ff27235bdf6a7e5390e2126c5
size 52869 size 52888