--- rpms/smeserver-awstats/contribs10/smeserver-awstats.spec 2023/03/21 13:07:04 1.10 +++ rpms/smeserver-awstats/contribs10/smeserver-awstats.spec 2024/03/01 16:09:10 1.12 @@ -1,10 +1,10 @@ -# $Id: smeserver-awstats.spec,v 1.9 2023/02/12 19:07:17 michel Exp $ +# $Id: smeserver-awstats.spec,v 1.11 2023/04/19 14:10:10 michel Exp $ # Authority: dungog # Name: Stephen Noble %define realname smeserver-awstats %define version 1.4 -%define release 8 +%define release 10 Summary: SME Server integration rpm for awstats Name: %{realname} @@ -17,18 +17,29 @@ BuildRoot: /var/tmp/%{name}-%{version} URL: https://wiki.koozali.org/AWStats BuildArchitectures: noarch BuildRequires: e-smith-devtools >= 1.13.1-03 -Requires: e-smith-release >= 9 +Requires: e-smith-release >= 10 Requires: awstats >= 6.5 +Requires: perl(POSIX) AutoReqProv: no Patch0: smeserver-awstats-1.4-bz11045.patch Patch1: smeserver-awstats-1.4-bz11998-backup.patch Patch2: smeserver-awstats-1.4-bz5925_add_qmail_stats.patch Patch3: smeserver-awstats-1.4-bz12324_sm2_initial.patch +Patch4: smeserver-awstats-1.4-bz12324_sm2_init_bis.patch +Patch5: smeserver-awstats-1.4-Alter-menu-category-for-new-arrangement.patch %description SME Server integration rpm for awstats. %changelog +* Fri Mar 01 2024 Brian Read 1.4-10.sme +- Edit SM2 Menu entry to conform to new arrangements [SME: 12493] + +* Fri Mar 24 2023 Michel Begue 1.4-9.sme +- fix typo and Requires in .spec file [SME: 12324] +- (sm2) consider Daily and Hourly Reported Period +- (sm2) remove unnecessary file in templates directory + * Mon Mar 20 2023 Michel Begue 1.4-8.sme - Initial release for server-manager (sm2) [SME: 12324] @@ -164,6 +175,8 @@ SME Server integration rpm for awstats. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build perl createlinks @@ -193,6 +206,11 @@ rm -rf %{name}-%{version} %pre %post +if (systemctl list-unit-files |grep smanager) then + echo "Smanager restart in spec file" + /sbin/e-smith/signal-event smanager-refresh; +fi + %preun %postun @@ -201,10 +219,11 @@ if [ $1 = 0 ] ; then /bin/rm -rf /etc/e-smith/web/panels/manager/cgi-bin/.awstats /bin/rm -rf /etc/e-smith/web/panels/user/html/awstats /bin/rm -rf /etc/e-smith/web/panels/user/cgi-bin/.awstats - /bin/rm -fs /usr/share/smanager/themes/default/images/awstats/icon + /bin/rm -f /usr/share/smanager/themes/default/images/awstats/icon /sbin/e-smith/config setprop AWStats status removed /sbin/e-smith/expand-template /etc/crontab fi +true %files -f %{name}-%{version}-filelist %defattr(-,root,root)