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

Accepting request 364943 from network:samba:STABLE

Browse Source 
- Only obsolete but do not provide gplv2/3 package names; (bsc#968973).

- Relocate existing lock files to /var/lib/samba/lock; (bsc#968963).

OBS-URL: https://build.opensuse.org/request/show/364943
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=198
This commit is contained in:
Dominique Leuenberger 2016-03-07 12:25:59 +00:00 committed by Git OBS Bridge
commit 7f7c75f59a
4 changed files with 22 additions and 14 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
oid sha256:abff919fade9fd55a74acd398865ab0ad9ef30052a25c876f54a831bbe512a45
size 12703
oid sha256:5b6319e2b07c7f7a2448209f2128daf859bb853040bbc95a51e5e6fc06a1c7f8
size 12667

10
samba.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Mar 1 18:03:17 UTC 2016 - lmuelle@suse.com
- Only obsolete but do not provide gplv2/3 package names; (bsc#968973).
-------------------------------------------------------------------
Tue Mar 1 17:28:09 UTC 2016 - lmuelle@suse.com
- Relocate existing lock files to /var/lib/samba/lock; (bsc#968963).
-------------------------------------------------------------------
Tue Feb 23 09:47:53 UTC 2016 - lmuelle@suse.com

18
samba.spec
View File

@ -142,14 +142,13 @@ BuildRequires: libpcp-devel
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 3599
%define SOURCE_TIMESTAMP 3611
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
Version: 4.3.5
Release: 0
Url: https://www.samba.org/
Provides: samba-gplv3 = %{version}
Obsoletes: samba-gplv3 < %{version}
%if 0%{?suse_version} > 1030
Recommends: cron
@ -251,10 +250,8 @@ Branch: %{BRANCH}
Summary: Samba Client Utilities
License: GPL-3.0+
Group: Productivity/Networking/Samba
Provides: samba-gplv3-client = %{version}
Provides: smbfs
Obsoletes: samba-gplv3-client < %{version}
Provides: samba-client-gplv2 = %{version}
Obsoletes: samba-client-gplv2 < %{version}
%if 0%{?suse_version} > 0
PreReq: %{?insserv_prereq}
@ -309,9 +306,7 @@ License: GPL-3.0+
Group: Documentation/Other
PreReq: coreutils
PreReq: findutils
Provides: samba-gplv3-doc = %{version}
Obsoletes: samba-gplv3-doc < %{version}
Provides: samba-doc-gplv2 = %{version}
Obsoletes: samba-doc-gplv2 < %{version}
%if 0%{?suse_version} > 1110
BuildArch: noarch
@ -414,7 +409,6 @@ Branch: %{BRANCH}
Summary: Winbind Daemon and Tool
License: GPL-3.0+
Group: Productivity/Networking/Samba
Provides: samba-gplv3-winbind = %{version}
Obsoletes: samba-gplv3-winbind < %{version}
Provides: samba-client:/usr/sbin/winbindd
Requires: %{libwbclient_name} = %{version}-%{release}
@ -1570,9 +1564,13 @@ else
%endif
done
fi
for fn in netlogon_creds_cli.tdb passdb.tdb secrets.tdb smbpasswd; do
for fn in MACHINE.SID idmap2.tdb idmap_test.tdb netlogon_creds_cli.tdb passdb.tdb secrets.tdb smbpasswd; do
test ! -e %{LOCKDIR}/private/$fn && test -e %{CONFIGDIR}/$fn && \
mv %{CONFIGDIR}/$fn %{LOCKDIR}/private
mv %{CONFIGDIR}/$fn %{LOCKDIR}/private/
done
for fn in brlock.tdb connections.tdb dbwrap_watchers.tdb gencache_notrans.tdb g_lock.tdb leases.tdb locking.tdb mutex.tdb names.tdb printer_list.tdb serverid.tdb smbXsrv_client_global.tdb smbXsrv_open_global.tdb smbXsrv_session_global.tdb smbXsrv_tcon_global.tdb smbXsrv_version_global.tdb srv_fss.tdb; do
test ! -e %{LOCKDIR}/lock/$fn && test -e %{LOCKDIR}/$fn && \
mv %{LOCKDIR}/$fn %{LOCKDIR}/lock/
done
%if 0%{?suse_version} && 0%{?suse_version} < 1221
if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
@ -1775,7 +1773,6 @@ fi
%{_libdir}/samba/config
%{_libdir}/samba/rpc
%attr(0775,root,ntadmin) %{LOCKDIR}/drivers
%dir %{LOCKDIR}/lock
%dir %{LOCKDIR}/lock/msg.lock
%{LOCKDIR}/netlogon
%attr(0770,root,users) %dir %{LOCKDIR}/profiles
@ -1955,6 +1952,7 @@ fi
%{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf
%{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client
%dir %{LOCKDIR}
%dir %{LOCKDIR}/lock
%dir %{LOCKDIR}/private
%attr(0700,root,root) %dir %{LOCKDIR}/private/msg.sock
%attr(0750,root,root) %dir %{LOGDIR}

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dfbf445865578d7e39cbe5d2d1f9f38b1c19496edc80b7f6ddb541ee4f80418e
size 55671
oid sha256:c65045cb4ebca0aa228364c5ea385f1818d0ada08bed54384b09668d082beb9e
size 55702