--- rpms/smeserver-geneweb/contribs10/smeserver-geneweb.spec	2021/03/15 17:11:44	1.2
+++ rpms/smeserver-geneweb/contribs10/smeserver-geneweb.spec	2021/03/23 19:13:58	1.3
@@ -1,8 +1,9 @@
 Summary: Package to integrate GeneWeb (V6) into SME Server
+
 %define name smeserver-geneweb
 Name: %{name}
 %define version 2.3.0
-%define release 2
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -10,6 +11,7 @@ Group: Applications/Internet
 Source: %{name}-%{version}.tar.xz
 Patch0: %{name}-%{version}-init_v10_systemd.patch
 Patch1: %{name}-%{version}-to_smanager.patch
+Patch2: %{name}-%{version}-TcpPort.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -20,33 +22,9 @@ BuildRequires: e-smith-devtools
 AutoReqProv: no
 
 %description
-This RPM must be installed after the geneweb*.el6.sme package
+This RPM must be installed after the geneweb package
 to complete the integration for SME Server.
 
-%changelog
-* Mon Mar 15 2021 Michel Begue <mab974@gmail.com> 2.3.0-2.sme
-- change geneweb & gwsetup to systemd services
-- add smeserver-geneweb-update event
-- add template and controller for smanager
-
-* Thu Nov 05 2020 Michel Begue <mab974@gmail.com> 2.3.0-1.sme
-- first import to sme 10 for geneweb v6.08
-
-* Thu Jul 30 2020 SME Translation Server <translations@contribs.org> 2.1.0-5.sme
-- apply locale 2020-07-30 patch
-
-* Sat Jul 11 2020 Michel Begue <mab974@gmail.com> 2.1.0-4.sme
-- geneweb and gwsetup services thru proxypass [SME: 10930]
-
-* Sat Dec 07 2019 SME Translation Server <translations@contribs.org> 2.1.0-2.sme
-- apply locale 2019-12-07 patch
-
-* Wed Apr 03 2019 Michel Begue <mab974@gmail.com> 2.1-1.sme
-- first import in sme9 for geneweb v6.08
-- geneweb service not started [SME: 6371]
-- Add "Base directory" input in panel console.
-- perms corrected in templates.metadata
-- normalize template and .spec
 
 %prep
 
@@ -55,6 +33,7 @@ rm -rf $RPM_BUILD_ROOT
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks
@@ -96,3 +75,33 @@ chown geneweb:geneweb /var/log/gwsetup
 /usr/bin/systemctl stop geneweb gwsetup
 
 %postun
+
+%changelog
+* 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
+- readd changelog from contribs9
+
+* Mon Mar 15 2021 Michel Begue <mab974@gmail.com> 2.3.0-2.sme
+- change geneweb & gwsetup to systemd services
+- add smeserver-geneweb-update event
+- add template and controller for smanager
+
+* Thu Nov 05 2020 Michel Begue <mab974@gmail.com> 2.3.0-1.sme
+- first import to sme 10 for geneweb v6.08
+
+* Thu Jul 30 2020 SME Translation Server <translations@contribs.org> 2.1.0-5.sme
+- apply locale 2020-07-30 patch
+
+* Sat Jul 11 2020 Michel Begue <mab974@gmail.com> 2.1.0-4.sme
+- geneweb and gwsetup services thru proxypass [SME: 10930]
+
+* Sat Dec 07 2019 SME Translation Server <translations@contribs.org> 2.1.0-2.sme
+- apply locale 2019-12-07 patch
+
+* Wed Apr 03 2019 Michel Begue <mab974@gmail.com> 2.1-1.sme
+- first import in sme9 for geneweb v6.08
+- geneweb service not started [SME: 6371]
+- Add "Base directory" input in panel console.
+- perms corrected in templates.metadata
+- normalize template and .spec