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

Accepting request 333929 from network:samba:STABLE

Browse Source 
- Relocate the tmpfiles.d directory to the client package; (bnc#947552).

- Do not provide libpdb0 from libsamba-passdb0 but add it to baselibs.conf
  instead; (bnc#942716).

OBS-URL: https://build.opensuse.org/request/show/333929
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=191
This commit is contained in:
Dominique Leuenberger 2015-10-01 10:22:29 +00:00 committed by Git OBS Bridge
commit c6596d637a
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
baselibs.conf
View File

@ -12,6 +12,7 @@ libregistry0
libsamba-credentials0 libsamba-credentials0
libsamba-hostconfig0 libsamba-hostconfig0
libsamba-passdb0 libsamba-passdb0
obsoletes "libpdb0-<targettype> < <version>"
libsamba-policy0 libsamba-policy0
libsamba-util0 libsamba-util0
libsamdb0 libsamdb0

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:f41b1ca9ba6ac11db93bf35ee0be2b4951c6ab3828d6177c48c091d672134eb6 oid sha256:8874bbeaca36120dfcf5ee0edc9f8b80217291f128cc6f503051d0faf3021321
size 29304 size 29242

13
samba.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Sep 25 15:23:47 UTC 2015 - lmuelle@suse.com
- Relocate the tmpfiles.d directory to the client package; (bnc#947552).
-------------------------------------------------------------------
Tue Sep 22 13:13:02 UTC 2015 - lmuelle@suse.com
- Do not provide libpdb0 from libsamba-passdb0 but add it to baselibs.conf
instead; (bnc#942716).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 16 13:06:36 UTC 2015 - lmuelle@suse.com Wed Sep 16 13:06:36 UTC 2015 - lmuelle@suse.com
@ -6,7 +17,7 @@ Wed Sep 16 13:06:36 UTC 2015 - lmuelle@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 11 15:53:45 UTC 2015 - lmuelle@suse.com Fri Sep 11 15:53:45 UTC 2015 - lmuelle@suse.com
- Package /var/lib/samba/msg with 0755 permissions; (bnc#945502). - Package /var/lib/samba/msg with 0755 permissions; (bso#11515); (bnc#945502).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 9 10:57:52 UTC 2015 - lmuelle@suse.com Wed Sep 9 10:57:52 UTC 2015 - lmuelle@suse.com

13
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 3485 %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
@ -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,7 @@ PreReq: %{?insserv_prereq}
PreReq: /sbin/ldconfig PreReq: /sbin/ldconfig
PreReq: /usr/sbin/groupadd PreReq: /usr/sbin/groupadd
PreReq: coreutils PreReq: coreutils
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.
@ -765,8 +765,7 @@ Branch: %{BRANCH}
Summary: Samba3 password database library Summary: Samba3 password database library
License: GPL-3.0+ License: GPL-3.0+
Group: System/Libraries Group: System/Libraries
Provides: libpdb0 Obsoletes: libpdb0 < %{version}
Obsoletes: libpdb0
%description -n libsamba-passdb0 %description -n libsamba-passdb0
@ -1654,8 +1653,6 @@ fi
%else %else
%{_unitdir}/nmb.service %{_unitdir}/nmb.service
%{_unitdir}/smb.service %{_unitdir}/smb.service
%dir %{_tmpfilesdir}
%{_tmpfilesdir}/samba.conf
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} < 1111 %if 0%{?suse_version} && 0%{?suse_version} < 1111
%attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbpasswd %attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbpasswd
@ -1858,6 +1855,8 @@ fi
%attr(0750,root,root) %dir %{LOGDIR} %attr(0750,root,root) %dir %{LOGDIR}
%ghost %dir %{PIDDIR} %ghost %dir %{PIDDIR}
%if 0%{?suse_version} > 1220 %if 0%{?suse_version} > 1220
%dir %{_tmpfilesdir}
%{_tmpfilesdir}/samba.conf
%{_var}/adm/fillup-templates/sysconfig.samba-client %{_var}/adm/fillup-templates/sysconfig.samba-client
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020

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:a80b6dfa1b959e07fabaf9cbe58450211ebed1bca0f181b05d5ad4ecaabbeb25 oid sha256:bd3ffa44c58b0365d5be277d10165fe28bb68a9ff27235bdf6a7e5390e2126c5
size 52898 size 52888