--- rpms/smeserver-awstats/contribs10/smeserver-awstats.spec	2020/10/20 11:19:32	1.2
+++ rpms/smeserver-awstats/contribs10/smeserver-awstats.spec	2022/07/30 18:01:48	1.8
@@ -1,10 +1,10 @@
-# $Id: smeserver-awstats.spec,v 1.1 2020/10/19 15:36:38 brianr Exp $
+# $Id: smeserver-awstats.spec,v 1.7 2022/07/21 18:15:34 jpp Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 %define realname smeserver-awstats
 %define version 1.4
-%define release 2
+%define release 6
 
 Summary:  SME Server intergration rpm for awstats
 Name: %{realname}
@@ -20,13 +20,29 @@ BuildRequires: e-smith-devtools >= 1.13.
 Requires: e-smith-release >= 9
 Requires: awstats >= 6.5
 AutoReqProv: no
-#Patch0: smeserver-awstats-1.4.
-#Patch1: smeserver-awstats-1.4.
+Patch0: smeserver-awstats-1.4-bz11045.patch
+Patch1: smeserver-awstats-1.4-bz11998-backup.patch
 
 %description
 SME Server integration rpm for awstats.
 
 %changelog
+* 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
+- add update event for easy install [SME: 11045]
+  rewrite spec and createlinks to be more smeserver compliant
+- run actions/awstats-upgrade on update of awstats or smeserver-awstats [SME: 10784]
+
+* Tue Oct 20 2020 BogusDateBot
+- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
+  by assuming the date is correct and changing the weekday.
+  Tue May 27 2001 --> Tue May 22 2001 or Sun May 27 2001 or Tue May 29 2001 or ....
+
 * Mon Oct 19 2020 Brian Read <brianr@bjsystems.co.uk> 1.4-2.sme
 - Initial import to SME10 tree  [SME: 11045]
 
@@ -116,7 +132,8 @@ SME Server integration rpm for awstats.
 * Thu Oct 04 2001 Michael Weinberger
 - based on AWStats 2.32
   RPM name changed
-* Tue May 27 2001 Michael Weinberger
+* Sun May 27 2001 Michael Weinberger
+  Tue May 27 2001 --> Tue May 22 2001 or Sun May 27 2001 or Tue May 29 2001 or ....
 - problems when started by e-smith events
   awstats pre-processor now runs in background
 * Tue May 01 2001 Michael Weinberger
@@ -135,19 +152,29 @@ SME Server integration rpm for awstats.
 
 %prep
 %setup -q -n %{realname}-%{version}
-#%patch0 -p1
-#%patch0 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 perl createlinks
+mkdir -p root/home/e-smith/files/users/admin/home/awstats
 mkdir -p root/etc/e-smith/web/panels/manager/html/awstats/icon
 mkdir -p root/etc/e-smith/web/panels/manager/cgi-bin/.awstats
+#user-manager
+mkdir -p root/etc/e-smith/web/panels/user/html/
+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
 rm -rf $RPM_BUILD_ROOT
 (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+	--dir '/home/e-smith/files/users/admin/home/awstats' 'attr(40770,admin,root)' \
+	--dir '/etc/e-smith/web/panels/manager/cgi-bin/.awstats' 'attr(40770,root,root)' \
+> %{name}-%{version}-filelist
 echo "%doc " >> %{name}-%{version}-filelist
 
 %clean
@@ -156,17 +183,7 @@ rm -rf %{name}-%{version}
 
 %pre
 %post
-mkdir -p /home/e-smith/files/users/admin/home/awstats
-chown -R admin.root /home/e-smith/files/users/admin/home/awstats
-chmod -R u+rw,g+rw /home/e-smith/files/users/admin/home/awstats
-/sbin/e-smith/config setprop AWStats status enabled
-/sbin/e-smith/signal-event awstats-update
 
-#user-manager
-/bin/mkdir -p /etc/e-smith/web/panels/user/html/
-/bin/mkdir -p /etc/e-smith/web/panels/user/cgi-bin/
-/bin/ln -fs /etc/e-smith/web/panels/manager/html/awstats /etc/e-smith/web/panels/user/html/awstats
-/bin/ln -fs /etc/e-smith/web/panels/manager/cgi-bin/.awstats /etc/e-smith/web/panels/user/cgi-bin/.awstats
 
 %preun
 %postun
@@ -182,6 +199,3 @@ fi
 %files -f %{name}-%{version}-filelist
 %defattr(-,root,root)
 
-#runs when awstats OR smeserver-awstats is installed or upgraded
-%triggerin -- awstats
-/etc/e-smith/events/actions/awstats-upgrade