--- rpms/smeserver-centos2sme/contribs10/smeserver-centos2sme.spec 2020/04/17 21:36:48 1.4 +++ rpms/smeserver-centos2sme/contribs10/smeserver-centos2sme.spec 2021/03/20 04:28:28 1.5 @@ -1,4 +1,4 @@ -# $Id: smeserver-centos2sme.spec,v 1.3 2020/04/17 16:19:34 jpp Exp $ +# $Id: smeserver-centos2sme.spec,v 1.4 2020/04/17 21:36:48 jpp Exp $ # Authority: unnilennium # Name: Jean-Philippe Pialasse @@ -6,7 +6,7 @@ Summary: smeserver-centos2sme %define name smeserver-centos2sme %define version 6.9.1 # version number CentosMajorVersion.SMEmajorVersion.RPMversion -%define release 8 +%define release 9 Name: %{name} Version: %{version} Release: %{release}%{?dist} @@ -17,6 +17,7 @@ Patch0: smeserver-centos2sme-6.9.1-bz105 Patch1: smeserver-centos2sme-6.9.1-bz10535-improvements.patch Patch2: smeserver-centos2sme-6.9.1-firstSME10.patch Patch3: smeserver-centos2sme-6.9.1-SME10-2.patch +Patch4: smeserver-centos2sme-6.9.1-secondSME10.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArch: noarch @@ -33,6 +34,7 @@ Do not use on a machine with user data p %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build # /usr/bin/perl createlinks @@ -55,6 +57,11 @@ rm -rf $RPM_BUILD_ROOT touch /etc/hosts.deny_ssh %changelog +* Sat Mar 20 2021 Jean-Philippe Pialasse 6.9.1-9.sme +- use systemctl when needed [SME: 10850] +- fix issue with sshd not reloading and locking user [SME: 10850] +- remove rpm -e dhcp-common + * Fri Apr 17 2020 Jean-Philipe Pialasse 6.9.1-8.sme - improve script - TODO: *some deps are forced, might be added as dep for e-smith-base