--- rpms/smeserver-support/sme10/smeserver-support.spec	2020/05/22 03:52:54	1.21
+++ rpms/smeserver-support/sme10/smeserver-support.spec	2021/04/20 02:56:24	1.25
@@ -1,18 +1,18 @@
-# $Id: smeserver-support.spec,v 1.20 2018/05/02 17:58:16 jpp Exp $
-
+# $Id: smeserver-support.spec,v 1.24 2021/04/08 01:50:58 jpp Exp $
+%define copykooz 2013 - 2021
 Summary: SME Server module to display support and licensing information
 %define name smeserver-support
 Name: %{name}
 %define version 2.8.0
-%define release 16
+%define release 20
 
 # 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}
@@ -26,6 +26,10 @@ Patch3: smeserver-support-2.8.0-koozali.
 Patch4: smeserver-support-2.8.0-koozali_manager.patch
 Patch5: smeserver-support-2.8.0-bz9676hover.patch
 Patch6: smeserver-support-2.8.0-bz10516.patch
+Patch7: smeserver-support-2.8.0-bz11167-update.patch
+Patch8: smeserver-support-2.8.0-bz11535.patch
+Patch9: smeserver-support-2.8.0-bz11568-copyright.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.7.5
 BuildArchitectures: noarch
@@ -104,6 +108,18 @@ Requires: psacct
 Requires: dmraid
 
 %changelog
+* Mon Apr 19 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-20.sme
+- fix copyright date and make it easier to update from spec file [SME: 11568]
+
+* Wed Apr 07 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.8.0-19.sme
+- fix typo and wording [SME: 11535]
+
+* Fri Jan 08 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-18.sme
+- add update event [SME: 11167]
+
+* Thu Nov 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-17.sme
+- revert update of samba using upstream CentOS repo [SME: 11196]
+
 * Thu May 21 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.8.0-16.sme
 - obsoletes e-smith-starterwebsite [SME: 8903]
 
@@ -932,12 +948,15 @@ SME Server module to display support and
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 perl createlinks
 
 ln -s initial.cgi root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/index.cgi
-
+find root/ -type f | xargs grep -l ____COPYYEARS____ | xargs sed -i -e 's/____COPYYEARS____/%{copykooz}/g'
 YUM_REPOS=root/etc/e-smith/db/yum_repositories/
 for dir in base updates
 do