--- rpms/smeserver-support/sme10/smeserver-support.spec 2018/05/02 17:58:16 1.20 +++ rpms/smeserver-support/sme10/smeserver-support.spec 2020/11/26 19:04:14 1.22 @@ -1,18 +1,18 @@ -# $Id: smeserver-support.spec,v 1.19 2018/02/11 04:52:58 jpp Exp $ +# $Id: smeserver-support.spec,v 1.21 2020/05/22 03:52:54 jpp Exp $ Summary: SME Server module to display support and licensing information %define name smeserver-support Name: %{name} %define version 2.8.0 -%define release 15 +%define release 17 # These packages come from CentOS, but we need to use care when # updating them - either we've patched them, or we need to do something # prior to taking the update # TODO: check mkinitrd,mdadm to see if needed -%define centos_excludes initscripts,libgsf,samba*,libsmbclient,libwbclient,libtevent,python-tevent -%define centos_remove kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl +%define centos_excludes initscripts,libgsf +%define centos_remove kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl,samba,samba-client,samba-client-libs,samba-common,samba-common-libs,samba-common-tools,samba-libs,samba*,libsmbclient,libwbclient,libtevent,python-tevent Version: %{version} Release: %{release}%{?dist} @@ -48,7 +48,7 @@ Requires: e-smith-domains Requires: e-smith-ibays Requires: e-smith-nutUPS Requires: e-smith-portforwarding -Requires: e-smith-starterwebsite +Obsoletes: e-smith-starterwebsite # 5.x used bind for name resolution - we need to pull in djbdns Requires: e-smith-dnscache @@ -104,6 +104,12 @@ Requires: psacct Requires: dmraid %changelog +* Thu Nov 26 2020 Jean-Philipe Pialasse 2.8.0-17.sme +- revert update of samba using upstream CentOS repo [SME: 11196] + +* Thu May 21 2020 Jean-Philipe Pialasse 2.8.0-16.sme +- obsoletes e-smith-starterwebsite [SME: 8903] + * Wed May 02 2018 Jean-Philipe Pialasse 2.8.0-15.sme - exclude libtevent,python-tevent from base and updates to avoid conflict with localy build version of samba [SME: 10573]