--- rpms/e-smith-base/sme10/e-smith-base.spec 2016/04/11 19:41:29 1.11 +++ rpms/e-smith-base/sme10/e-smith-base.spec 2016/07/18 07:58:17 1.25 @@ -1,10 +1,10 @@ -# $Id: e-smith-base.spec,v 1.10 2016/04/11 19:04:48 vip-ire Exp $ +# $Id: e-smith-base.spec,v 1.24 2016/07/16 14:47:40 unnilennium Exp $ Summary: e-smith server and gateway - base module %define name e-smith-base Name: %{name} %define version 5.8.0 -%define release 9 +%define release 22 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -13,8 +13,18 @@ Source: %{name}-%{version}.tar.xz Patch0: e-smith-base-5.8.0-cpuspeed.patch Patch1: e-smith-base-5.8.0-remove_obsolete_services.patch Patch2: e-smith-base-5.8.0-remove_ctrlaltdel.patch +Patch3: e-smith-base-5.8.0-movese_services_to_systemd.patch +Patch4: e-smith-base-5.8.0-LOCALE.patch +Patch5: e-smith-base-5.8.0-install_on_every_reboot.patch +Patch6: e-smith-base-5.8.0-PasswordSet.patch +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 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot -BuildArch: noarch Requires: pwauth Requires: e-smith-lib >= 2.2.0-2 Requires: server-manager-images, server-manager @@ -41,6 +51,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 @@ -58,6 +69,49 @@ AutoReqProv: no e-smith server and gateway software - base module. %changelog +* 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] + +* Sun May 29 2016 Jean-Philipe Pialasse 5.8.0-16.sme +- Allow bootstrap to start services after post-install configuration [SME: 9530] + +* Thu May 12 2016 Daniel Berteaud 5.8.0-15.sme +- Use a C wrapper for the console to replace perl-suid [SME: 9393] + +* Wed Apr 13 2016 Jean-Philipe Pialasse 5.8.0-14.sme +- fix password not asked after signal-event post-install [SME: 9445] + +* Wed Apr 13 2016 Jean-Philipe Pialasse 5.8.0-13.sme +- only start services on regular boot [SME: 9436] + +* Tue Apr 12 2016 Jean-Philipe Pialasse 5.8.0-12.sme +- fix getting locale for db configuration [SME: 9378] + +* Mon Apr 11 2016 Jean-Philipe Pialasse 5.8.0-11.sme +- rearange startup [SME: 9352] +- let systemd handle following unsupervised services: +- bootstrap-console, rsyslog, irqbalance, crond, acpid, smartd +- disable from systemd services whith link in rc7.d +- let bootstrap-console run at every reboot and handle surpevised services startup + * Mon Apr 11 2016 Daniel Berteaud 5.8.0-9.sme - Remove ctrlaltdel service entry [SME: 9437] @@ -1813,6 +1867,17 @@ e-smith server and gateway software - ba %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 %pre /sbin/e-smith/create-system-user smelastsys 2999 \ @@ -1832,11 +1897,13 @@ done /sbin/e-smith/generate-lexicons -xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console +xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console.pl perl createlinks /sbin/e-smith/buildtests 10e-smith-base +gcc -o root/sbin/e-smith/console console_wrapper.c + %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/etc/selinux