--- rpms/smeserver-geneweb/contribs10/smeserver-geneweb.spec	2021/03/23 19:13:58	1.3
+++ rpms/smeserver-geneweb/contribs10/smeserver-geneweb.spec	2022/07/30 18:07:22	1.7
@@ -3,7 +3,7 @@ Summary: Package to integrate GeneWeb (V
 %define name smeserver-geneweb
 Name: %{name}
 %define version 2.3.0
-%define release 3
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,9 @@ Source: %{name}-%{version}.tar.xz
 Patch0: %{name}-%{version}-init_v10_systemd.patch
 Patch1: %{name}-%{version}-to_smanager.patch
 Patch2: %{name}-%{version}-TcpPort.patch
+Patch3: smeserver-geneweb-2.3.0-locale-2021-08-22.patch
+Patch4: smeserver-geneweb-2.3.0-Add-class-to-div-for-AdminLTE.patch
+Patch5: smeserver-geneweb-2.3.0-migrate-logs-users-bz12047_httpd-bz12074_backup.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -19,13 +22,14 @@ Requires: geneweb >= 6.08
 Requires: smeserver-release >= 10.0
 Requires: e-smith-formmagick >= 2.4.0-1
 BuildRequires: e-smith-devtools
+Requires: e-smith-apache >= 2.6.0-19
+Requires: smeserver-php >= 3.0.0-43
 AutoReqProv: no
 
 %description
 This RPM must be installed after the geneweb package
 to complete the integration for SME Server.
 
-
 %prep
 
 rm -rf $RPM_BUILD_ROOT
@@ -34,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks
@@ -57,17 +64,12 @@ echo "%doc COPYING" >> %{name}-%{version
 %attr(755, root, root) /usr/lib/systemd/systemd-geneweb
 %attr(755, root, root) /usr/lib/systemd/systemd-gwsetup
 
-
 %clean 
 rm -rf $RPM_BUILD_ROOT
 
 %pre
 
 %post
-mkdir -p /var/log/geneweb
-chown geneweb:geneweb /var/log/geneweb
-mkdir -p /var/log/gwsetup
-chown geneweb:geneweb /var/log/gwsetup
 
 %preun
 /sbin/e-smith/db configuration setprop geneweb status disabled
@@ -77,6 +79,22 @@ chown geneweb:geneweb /var/log/gwsetup
 %postun
 
 %changelog
+* Sat Jul 30 2022 Brian Read <brianr@bjsystems.co.uk> 2.3.0-7.sme
+- Re-build and link to latest devtools [SME: 11997]
+
+* Thu Jul 14 2022 Michel Begue <mab974@misouk.com> 2.3.0-6.sme
+- Re-build and link to latest devtools migrate fragment error [SME: 11610]
+- back to standard log files and fix log files not fed 
+- run 2 services with user geneweb
+- add geneweb to backup list [SME: 12074]
+- update to httpd 2.4 syntax [SME: 12047]
+
+* Fri Jan 07 2022 Brian Read <brianr@bjsystems.co.uk> 2.3.0-5.sme
+- Add-class-to-div-for-AdminLTE [SME: 11838]
+
+* Sun Aug 22 2021 Terry Fage <terry.fage@gmail.com> 2.3.0-4.sme
+- apply locale 2021-08-22 patch
+
 * Tue Mar 23 2021 Michel Begue <mab974@gmail.com> 2.3.0-3.sme
 - change TCPPort attributes to avoid filtering effect [SME: 10930] 
 - move changelog to the bottom of spec