From 846f6c0214da575bfa5dbbf5ecf6687ae4ca8df1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 11 Nov 2013 12:18:23 +0100 Subject: [PATCH] Fix the upgrade path. related: #884169 --- samba.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/samba.spec b/samba.spec index 7208b11..eaac56e 100644 --- a/samba.spec +++ b/samba.spec @@ -1,7 +1,7 @@ # Set --with testsuite or %bcond_without to run the Samba torture testsuite. %bcond_with testsuite -%define main_release 4 +%define main_release 5 %define samba_version 4.1.0 %define talloc_version 2.0.8 @@ -103,6 +103,14 @@ Requires: libwbclient = %{samba_depver} Provides: samba4 = %{samba_depver} Obsoletes: samba4 < %{samba_depver} +# We don't build it outdated docs anymore +Obsoletes: samba-doc +# Is not supported yet +Obsoletes: samba-domainjoin-gui +# SWAT been deprecated and removed from samba +Obsoletes: samba-swat +Obsoletes: samba4-swat + %if %with_clustering_support BuildRequires: ctdb-devel %endif @@ -328,6 +336,8 @@ The libwbclient package contains the winbind client library from the Samba suite Summary: Developer tools for the winbind library Group: Development/Libraries Requires: libwbclient = %{samba_depver} +Obsoletes: samba-winbind-devel +Provides: samba-winbind-devel %description -n libwbclient-devel The libwbclient-devel package provides developer tools for the wbclient library. @@ -1530,6 +1540,9 @@ rm -rf %{buildroot} %{_mandir}/man8/pam_winbind.8* %changelog +* Mon Nov 11 2013 - Andreas Schneider - 4.1.0-5 +- related: #884169 - Fix the upgrade path. + * Wed Oct 30 2013 - Andreas Schneider - 4.1.0-4 - related: #884169 - Add direct dependency to samba-libs in the glusterfs package.