--- rpms/smeserver-awstats/contribs10/smeserver-awstats.spec	2022/07/21 14:37:45	1.6
+++ rpms/smeserver-awstats/contribs10/smeserver-awstats.spec	2024/03/01 16:09:10	1.12
@@ -1,12 +1,12 @@
-# $Id: smeserver-awstats.spec,v 1.5 2021/02/22 20:14:44 jpp 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 4
+%define release 10
 
-Summary:  SME Server intergration rpm for awstats
+Summary:  SME Server integration rpm for awstats
 Name: %{realname}
 Version: %{version}
 Release: %{release}%{?dist}
@@ -14,20 +14,42 @@ License: GNU GPL (GNU General Public Lic
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
 BuildRoot: /var/tmp/%{name}-%{version}
-URL: http://www.dungog.net/sme
+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
-* Thu Jul 21 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.4-4.sme
+* Fri Mar 01 2024 Brian Read <brianr@koozali.org> 1.4-10.sme
+- Edit SM2 Menu entry to conform to new arrangements [SME: 12493]
+
+* Fri Mar 24 2023 Michel Begue <mab974@misouk.com> 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 <mab974@misouk.com> 1.4-8.sme
+- Initial release for server-manager (sm2) [SME: 12324]
+
+* Sun Feb 12 2023 Michel Begue <mab974@misouk.com> 1.4-7.sme
+- add mail stats to panel (ftp stats too) [SME: 5925]
+
+* Sat Jul 30 2022 Brian Read <brianr@bjsystems.co.uk> 1.4-6.sme
+- Re-build and link to latest devtools [SME: 11997]
+
+* Thu Jul 21 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.4-5.sme
 - add to core backup [SME: 11998]
 
 * Mon Feb 22 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.4-3.sme
@@ -150,7 +172,11 @@ SME Server integration rpm for awstats.
 %prep
 %setup -q -n %{realname}-%{version}
 %patch0 -p1
-%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks
@@ -162,7 +188,6 @@ mkdir -p root/etc/e-smith/web/panels/use
 mkdir -p root/etc/e-smith/web/panels/user/cgi-bin/
 ln -fs /etc/e-smith/web/panels/manager/html/awstats root/etc/e-smith/web/panels/user/html/awstats
 ln -fs /etc/e-smith/web/panels/manager/cgi-bin/.awstats root/etc/e-smith/web/panels/user/cgi-bin/.awstats
-
 echo %{version}-%{release} > root/etc/e-smith/web/panels/manager/cgi-bin/.awstats/version
 
 %install
@@ -181,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
@@ -189,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 -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)
-