From e8d66ad90cbbe8386403d3a526885ae7487b4cd9ebaed2665fbd388f74c81e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 1 Mar 2016 18:18:14 +0000 Subject: [PATCH] Only obsolete but do not provide gplv2/3 package names; (bsc#968973). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=528 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 8 +------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 9392af3..250d7be 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f1cfb5be95e738f5532b1823d05d62cd74a0180d483213703f2eccb879e8100 -size 12725 +oid sha256:7faac92050b79673cf8dc00b1f58c0514be1e032e76920bb35c44b5733574109 +size 12707 diff --git a/samba.changes b/samba.changes index e0f8f75..0168dbd 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/samba.spec b/samba.spec index b98d510..e3a347a 100644 --- a/samba.spec +++ b/samba.spec @@ -142,14 +142,13 @@ BuildRequires: libpcp-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3607 +%define SOURCE_TIMESTAMP 0 %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} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 417c837..c358f76 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:163edeacaedd59e3721c0c113cfd03abadf8b1648dac2a2f3bfe7010b967ef07 -size 55710 +oid sha256:00a65248884f3df5c551e5eca9e1ee237d44857b6931e038830932b741ad3259 +size 55714