--- rpms/e-smith-base/sme10/e-smith-base.spec 2016/06/02 15:07:45 1.19 +++ rpms/e-smith-base/sme10/e-smith-base.spec 2017/02/17 19:39:37 1.34 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.18 2016/05/29 18:26:00 unnilennium Exp $ +# $Id: e-smith-base.spec,v 1.33 2017/02/09 11:23:25 vip-ire Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.8.0 -%define release 17 +%define release 31 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -20,6 +20,18 @@ Patch6: e-smith-base-5.8.0-PasswordSet.p Patch7: e-smith-base-5.8.0-console_wrapper.patch Patch8: e-smith-base-5.8.0-postinstall.patch Patch9: e-smith-base-5.8.0-fix_forward_field_display.patch +Patch10: e-smith-base-5.8.0.bz9631.SetHostnameByHostnamectl.patch +Patch11: e-smith-base-5.8.0.bz9398.DeprecatedRsyslogSyntax.patch +Patch12: e-smith-base-5.8.0.bz9641.fix-startup-path.patch +Patch13: e-smith-base-5.8.0-mariadb.patch +Patch14: e-smith-base-5.8.0.bz9687.local-link.patch +Patch15: e-smith-base-5.8.0-bz9688.skipredirect.patch +Patch16: e-smith-base-5.8.0-bz9672.servicesystemd.patch +Patch17: e-smith-base-5.8.0.bz9724.locale_sysconfig.patch +Patch18: e-smith-base-5.8.0-allow_32bits_mask.patch +Patch19: e-smith-base-5.8.0-ip_route_syntax.patch +Patch20: e-smith-base-5.8.0.bz9550.fixconsolerestore.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot Requires: pwauth Requires: e-smith-lib >= 2.2.0-2 @@ -47,6 +59,7 @@ Requires: diald Requires: /usr/bin/passwd Requires: nss-pam-ldapd Requires: uuid-perl +Requires: kbd Obsoletes: nss_ldap < 254 Requires: cpu >= 1.4.3 Obsoletes: rlinetd, e-smith-mod_ssl @@ -64,6 +77,46 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* Fri Feb 17 2017 Jean-Philipe Pialasse 5.8.0-31.sme +- prevent restoration from being called on regular and post-upgrade reboot [SME: 9550] +- console restoration can be launched again from console + +* Thu Feb 9 2017 Daniel Berteaud 5.8.0-30.sme +- Use ip route syntax to define routes to local network [SME: 10083] + +* Tue Sep 6 2016 Daniel Berteaud 5.8.0-29.sme +- Allow /32 masks on the external interface, in which case we don't + check if the gateway is on the correct network) [SME: 9610] + +* Thu Aug 04 2016 Jean-Philipe Pialasse 5.8.0-28.sme +- fix config db locale property [SME: 9724] + +* Sat Jul 23 2016 Jean-Philipe Pialasse 5.8.0-27.sme +- adapt e-smith service command to systemd [SME: 9672] + +* Fri Jul 22 2016 Jean-Philipe Pialasse 5.8.0-26.sme +- add systemd skip redirect to e-smith-service [SME: 9688] + +* Thu Jul 21 2016 Jean-Philipe Pialasse 5.8.0-25.sme +- fix broken link /etc/init.d/supervise/local link [SME: 9687] + +* Mon Jul 18 2016 Jean-Philipe Pialasse 5.8.0-22.sme +- fix mysqld to mariadb [SME: 9438] + +* Sat Jul 16 2016 Jean-Philipe Pialasse 5.8.0-21.sme +- fix missing path to chkconfig [SME: 9641] + +* Thu Jul 14 2016 stephane de Labrusse 5.8.0-20.sme +- Fix deprecated syntax '*' in rsyslog [SME: 9398] +- Added e-smith-base-5.8.0.bz9398.DeprecatedRsyslogSyntax.patch + +* Mon Jul 4 2016 stephane de Labrusse 5.8.0-19.sme +- Set the hostname by hostnamectl [SME: 9631] +- Stefano Zamboni + +* Sun Jun 12 2016 Jean-Philipe Pialasse 5.8.0-18.sme +- fix Lang and keyboard layout configured are not used [SME: 9539] + * Thu Jun 2 2016 Daniel Berteaud 5.8.0-17.sme - Fix display of email forward fields since smtpd entry has been merged qpsmtpd [SME: 9552] @@ -1852,7 +1905,17 @@ e-smith server and gateway software - ba %patch7 -p1 %patch8 -p1 %patch9 -p1 - +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 +%patch19 -p1 +%patch20 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \