--- rpms/e-smith-lib/sme10/e-smith-lib.spec 2016/07/18 07:53:38 1.4 +++ rpms/e-smith-lib/sme10/e-smith-lib.spec 2021/10/28 04:13:03 1.17 @@ -1,15 +1,28 @@ -# $Id: e-smith-lib.spec,v 1.3 2016/07/18 07:52:44 unnilennium Exp $ +# $Id: e-smith-lib.spec,v 1.16 2021/04/20 03:25:45 jpp Exp $ + +%define copykooz 2013-2021 Summary: e-smith server and gateway - library module %define name e-smith-lib Name: %{name} %define version 2.6.0 -%define release 3 +%define release 15 Version: %{version} Release: %{release}%{?dist} License: Artistic Group: Networking/Daemons Source: %{name}-%{version}.tar.xz +Patch0: e-smith-lib-2.6.0.bz9660.serviceControlSystemd.patch +Patch1: e-smith-lib-2.6.0-mariadb.patch +Patch2: e-smith-lib-2.6.0.bz9691.syslof.patch +Patch3: e-smith-lib-2.6.0.bz9585.fix_startup_display.patch +Patch4: e-smith-lib-2.6.0.bz9478.patch +Patch5: e-smith-lib-2.6.0.bz10848.systemctl-reload-or-restart.patch +Patch6: e-smith-lib-2.6.0-bz11177-systemd.patch +Patch7: e-smith-lib-2.6.0-bz11177-signals.patch +Patch8: e-smith-lib-2.6.0-bz11570-copyrights.patch +Patch9: e-smith-lib-2.6.0-bz11723.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch BuildRequires: e-smith-devtools >= 1.6.3-01 @@ -24,12 +37,55 @@ Requires: perl(I18N::LangTags) >= 0.27 Requires: perl(Net::IPv4Addr) >= 0.10 Requires: perl(Taint::Util) Requires: pciutils -Patch0: e-smith-lib-2.6.0.bz9660.serviceControlSystemd.patch -Patch1: e-smith-lib-2.6.0-mariadb.patch + %description e-smith server and gateway software - library module. %changelog +* Thu Oct 28 2021 Jean-Philippe Pialasse 2.6.0-15.sme +- add support for service with instances [SME: 11723] + +* Mon Apr 19 2021 Jean-Philippe Pialasse 2.6.0-14.sme +- update copyright dates, and make it easier to change from spec file [SME: 11570] + +* Sat Jan 02 2021 Jean-Philipe Pialasse 2.6.0-13.sme +- partial revert of signals [SME: 11177] + signal s not passed to runit services (dnscache*, qmail, qpsmtpd...) + services handled by systemd crash if they do not have Restart=always defined + +* Fri Jan 01 2021 Jean-Philipe Pialasse 2.6.0-12.sme +- add support for signals SIG* with systemd [SME: 11177] + fix typo for reload-or-try-restart + unsupervised services: really stop when disabled and start stopped enabled ones + +* Thu Nov 26 2020 Jean-Philipe Pialasse 2.6.0-11.sme +- remove error when sending sighup event [SME: 11177] + +* Tue Nov 17 2020 Jean-Philipe Pialasse 2.6.0-10.sme +- allow more systemctl controls [SME: 11177] + convert unrecognized signals from service2adjust in events for systemd + handle unsupervised services the same way supervised were in adjust-services +- create e-smith-lib-event [SME: 11141] + +* Thu Dec 12 2019 Jean-Philipe Pialasse 2.6.0-9.sme +- add support for systemctl reload-or-restart, try-restart, enable -now [SME: 10848] + +* Wed Oct 25 2017 Daniel Berteaud 2.6.0-8.sme +- Revert prev change regarding tap_soft, as it's not needed [SME: 10445] + +* Mon Oct 23 2017 Daniel Berteaud 2.6.0-7.sme +- Skip tap_soft interfaces (eg SoftEther, code from Hsing-Foo Wang) + [SME: 10445] + +* Wed Apr 12 2017 Jean-Philipe Pialasse 2.6.0-6.sme +- remove reference to smtpd in configuration.conf [SME: 9478] + +* Thu Aug 04 2016 Jean-Philipe Pialasse 2.6.0-5.sme +- fix console startup display [SME: 9352] + +* Sat Jul 23 2016 Jean-Philipe Pialasse 2.6.0-4.sme +- fix service name syslog to rsyslog [SME: 9691] + * Mon Jul 18 2016 Jean-Philipe Pialasse 2.6.0-3.sme - fix mysqld to mariadb [SME: 9438] - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, @@ -815,6 +871,16 @@ e-smith server and gateway software - li %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +# creating an event that do nothing. db init is done every time by yum already. +mkdir root/etc/e-smith/events/e-smith-lib-update +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 %pre @@ -827,6 +893,7 @@ do mkdir -p root/etc/e-smith/events/$event done perl createlinks +find root/ -type f | xargs grep -l ____COPYYEARS____ | xargs sed -i -e 's/____COPYYEARS____/%{copykooz}/g' %install rm -rf $RPM_BUILD_ROOT