pool/samba
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=500
This commit is contained in:
Lars Müller 2015-09-25 13:42:08 +00:00 committed by Git OBS Bridge
parent ff3dd43321
commit f50d1b53d2
4 changed files with 21 additions and 10 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:b5b8d6962ed807f9fb932ed70063bcef81bc4edae8f9bddd11e6bdf3f9c4f03e oid sha256:c72a9314d0ceab45dfac826730e748f724c13a51be4f100a5ed2b2f9539b688e
size 29274 size 29279

5
samba.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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

18
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 3490 %define SOURCE_TIMESTAMP 3492
%define BRANCH %{version} %define BRANCH %{version}
%global with_mitkrb5 1 %global with_mitkrb5 1
%global with_dc 0 %global with_dc 0
@ -153,7 +153,6 @@ Release: 0
Url: http://www.samba.org/ Url: http://www.samba.org/
Provides: samba-gplv3 = %{version} Provides: samba-gplv3 = %{version}
Obsoletes: samba-gplv3 < %{version} Obsoletes: samba-gplv3 < %{version}
Requires: samba-client >= %{version}
%if 0%{?suse_version} > 1030 %if 0%{?suse_version} > 1030
Recommends: cron Recommends: cron
Recommends: logrotate Recommends: logrotate
@ -175,6 +174,7 @@ PreReq: grep
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
PreReq: %{fillup_prereq} PreReq: %{fillup_prereq}
%endif %endif
PreReq: samba-client >= %{version}
# Choose some features / extra packages here # Choose some features / extra packages here
############################################ ############################################
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1120
@ -420,7 +420,6 @@ Provides: samba-gplv3-winbind = %{version}
Obsoletes: samba-gplv3-winbind < %{version} Obsoletes: samba-gplv3-winbind < %{version}
Provides: samba-client:/usr/sbin/winbindd Provides: samba-client:/usr/sbin/winbindd
Requires: %{libwbclient_name} = %{version}-%{release} Requires: %{libwbclient_name} = %{version}-%{release}
Requires: samba-client >= %{version}
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: pam-config Requires: pam-config
%endif %endif
@ -435,6 +434,8 @@ 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}
%description winbind %description winbind
This is the winbind-daemon and the wbinfo-tool. This is the winbind-daemon and the wbinfo-tool.
@ -1453,6 +1454,10 @@ 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
@ -1524,9 +1529,6 @@ 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
@ -1608,6 +1610,10 @@ 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:7ce801dae444ddf8c66358801678e1e460465a86836bad03c1e786fe68359e38 oid sha256:9f660ee6421601bd8dedb081326b5bafae0273ce1ddf1f51ba887a20f5b5bd21
size 52858 size 53073