--- rpms/smeserver-support/sme10/smeserver-support.spec 2016/07/19 09:06:37 1.13 +++ rpms/smeserver-support/sme10/smeserver-support.spec 2021/04/08 01:50:58 1.24 @@ -1,10 +1,10 @@ -# $Id: smeserver-support.spec,v 1.12 2016/06/16 19:35:34 stephdl Exp $ +# $Id: smeserver-support.spec,v 1.23 2021/01/08 18:58:31 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 9 +%define release 19 # 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 @@ -12,7 +12,7 @@ Name: %{name} # TODO: check mkinitrd,mdadm to see if needed %define centos_excludes initscripts,libgsf -%define centos_remove kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl +%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} @@ -23,12 +23,21 @@ Patch0: smeserver-support-2.8.0-update_c Patch1: smeserver-support-2.8.0-remove_smolt_service.patch Patch2: smeserver-support-2.8.0.os-release.patch Patch3: smeserver-support-2.8.0-koozali.patch +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 + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildRequires: e-smith-devtools >= 1.7.5 BuildArchitectures: noarch Provides: server-manager-images AutoReqProv: no +# SME 10 requires these explicitly +Requires: perl(LWP::Protocol::https) + # New features that we want to pull in on upgrades Requires: screen Requires: smeserver-yum @@ -42,7 +51,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 @@ -98,10 +107,40 @@ Requires: psacct Requires: dmraid %changelog +* Wed Apr 07 2021 Jean-Philippe Pialasse 2.8.0-19.sme +- fix typo and wording [SME: 11535] + +* Fri Jan 08 2021 Jean-Philipe Pialasse 2.8.0-18.sme +- add update event [SME: 11167] + +* 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] + +* Sat Feb 10 2018 Jean-Philipe Pialasse 2.8.0-14.sme +- add back perl(LWP::Protocol::https) support [SME: 10516] + +* Mon Sep 25 2017 Jean-Philipe Pialasse 2.8.0-13.sme +- upstream samba packages were not all excluded [SME: 10428] + +* Mon Mar 20 2017 Jean-Philipe Pialasse 2.8.0-12.sme +- exclude samba from centos repo as we have our own with DC support [SME: 10155] + +* Fri Mar 03 2017 Jean-Philipe Pialasse 2.8.0-11.sme +- improving link to donation [SME: 9598] + +* Tue Jul 19 2016 Jean-Philipe Pialasse 2.8.0-10.sme +- fix hover color [SME: 9676] + * Tue Jul 19 2016 Jean-Philipe Pialasse 2.8.0-9.sme - Koozali branding of manager [SME: 9676] -- new image in archive; removed old images from cvs -- +- new images in archive; removed old images from cvs +- updated some css smeserver-support-2.8.0-koozali_manager.patch * Wed Jun 15 2016 Jean-Philipe Pialasse 2.8.0-8.sme - reverting partly the changes in last patch [SME: 9598] @@ -902,6 +941,11 @@ SME Server module to display support and %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build perl createlinks