--- rpms/smeserver-unjunkmgr/contribs10/smeserver-unjunkmgr.spec	2020/11/18 18:43:36	1.4
+++ rpms/smeserver-unjunkmgr/contribs10/smeserver-unjunkmgr.spec	2022/08/02 01:49:38	1.10
@@ -1,31 +1,62 @@
-# $Id: smeserver-unjunkmgr.spec,v 1.3 2020/11/18 16:11:30 jcrisp Exp $
+# $Id: smeserver-unjunkmgr.spec,v 1.9 2021/11/07 03:46:04 jpp Exp $
 # Authority: jesperknudsen
 # Name: Jesper Knudsen
 
 Summary: SME Server UnJunk Manager
 %define name smeserver-unjunkmgr
-%define version 3.0
-%define release 2
+%define version 3.1
+%define release 6
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: SME Server/addon
 Source: %{name}-%{version}.tgz
-Patch0: smeserver-unjunkmgr-bz11178-patch-ttf-dir.patch
-Patch1: smeserver-unjunkmgr-3.0-Fix-SME-Version-Check.patch
+Patch0: smeserver-unjunkmgr-cleanup-index-php.patch
+#Patch1: smeserver-unjunkmgr-bzxxxxx-fix-stuff.patch
+Patch3: smeserver-unjunkmgr-3.1-Add-Update-event-to-createlinks.patch
+Patch4: smeserver-unjunkmgr-3.1-missing-bracket.patch
+Patch5: smeserver-unjunkmgr-3.1-bz11737.patch
+Patch6: smeserver-unjunkmgr-3.1-bz12063-24syntax.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 BuildRequires: e-smith-devtools
 Requires: smeserver-release >= 10.0
+Requires: e-smith-apache >= 2.6.0-19
 Requires: perl-MIME-Lite => 3
 Requires: perl-DateManip => 5.40
 Requires: mrtg
 Requires: perl-Email-Date-Format
+Requires: jpgraph
 Obsoletes: sme-unjunkmgr
 
 %changelog
+* Mon Aug 01 2022 Jean-Philippe Pialasse <tests@pialasse.com> 3.1-6.sme
+- update to httpd 2.4 access syntax [SME: 12063]
+  thanks to Vasarhelyi Zsolt
+
+* Sat Nov 06 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.1-5.sme
+- fix unjunk links failing [SME: 11737]
+
+* Tue Jun 01 2021 Jean-Philippe Pialasse <tests@pialasse.com> 3.1-4.sme
+- fix missing curly bracket and indentation [SME: 11178]
+
+* Thu Apr 01 2021 Brian Read <brianr@bjsystems.co.uk> 3.1-3.sme
+- Add Update event to createlinks [SME: 11178]
+
+* Thu Apr 01 2021 BogusDateBot
+- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
+  by assuming the date is correct and changing the weekday.
+
+* Tue Nov 24 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.1-2.sme
+- Add cleaned up and fixed index.php that I forgot
+
+* Tue Nov 24 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.1-1.sme
+- Remove jpgraph to its own rpm
+- cleanup of various files 
+- remove references to old SME versions
+
 * Wed Nov 18 2020 Brian Read <brianr@bjsystems.co.uk> 3.0-2.sme
 - Fix SME Version check in perl stats prgram [SME: 11178]
 
@@ -43,7 +74,7 @@ Obsoletes: sme-unjunkmgr
 - added a unjunkmgr menu entry in the server-manager [sme : 8307] 
 
 * Thu Jun 27 2013 JP Pialasse <tests@pialasse.com> 2.1-2.sme
-- fix some php deprecated and PHP warning
+- Add Update event to createlinks some php deprecated and PHP warning
 - patch1
 
 * Wed Jun 26 2013 JP Pialasse <tests@pialasse.com> 2.1-1.sme
@@ -52,7 +83,7 @@ Obsoletes: sme-unjunkmgr
 - patch ttfpatch
 
 * Tue Jun 25 2013 JP Pialasse <tests@pialasse.com> 2.0-4.sme
-- fix db default [SME: 7701]
+- Add Update event to createlinks db default [SME: 7701]
 - patch0
 - added createlink in spec file
 
@@ -86,7 +117,11 @@ sends out a weekly summary where they ca
 %prep
 %setup
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks