--- rpms/e-smith-apache/sme10/e-smith-apache.spec	2016/02/06 08:53:30	1.3
+++ rpms/e-smith-apache/sme10/e-smith-apache.spec	2020/06/23 18:42:24	1.11
@@ -1,15 +1,21 @@
-# $Id: e-smith-apache.spec,v 1.2 2016/02/06 08:36:07 stephdl Exp $
+# $Id: e-smith-apache.spec,v 1.10 2020/05/03 02:07:56 jpp Exp $
 
 Summary: e-smith server and gateway - apache module
 %define name e-smith-apache
 Name: %{name}
-%define version 2.6.1
-%define release 2
+%define version 2.6.0
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
+Patch0: e-smith-apache-2.6.0-httpd24.patch
+Patch1: e-smith-apache-2.6.0-bz9591-iconspath.patch
+Patch2: e-smith-apache-2.6.0-bz10916-SSLHonorCipherOrder.patch
+Patch3: e-smith-apache-2.6.0-bz10459-Ciphers-and-TLS.patch
+Patch4: e-smith-apache-2.6.0-bz10867-remove-php3-refs.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.15.1
@@ -28,10 +34,54 @@ BuildRequires: e-smith-devtools >= 1.11.
 %description
 e-smith server and gateway software - apache module.
 
+%prep
+%setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+%build
+perl createlinks
+
+%install
+rm -rf $RPM_BUILD_ROOT
+(cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
+
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+    --dir /var/service/httpd-e-smith 'attr(01755,root,root)' \
+    --file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \
+    --file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \
+    > e-smith-%{version}-filelist
+
+echo "%doc COPYING"          >> e-smith-%{version}-filelist
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f e-smith-%{version}-filelist
+%defattr(-,root,root)
+
+
 %changelog
-* Sat Feb 6 2016 stephane de Labrusse <stephdl@de-labrusse.fr>  2.6.1-2.sme
-- Corrected the problem of hard symlink in archive by a symlink creation 
-- in the createlinks [SME: 9215]
+* Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-8.sme
+- remove php3 and php4 refs [SME: 10867]
+
+* Fri May 01 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- disable TLSv1 TLSv1.1 by default [SME: 10459]
+  * put strong ciphers first in default string
+  * cipher order and properties with periods
+
+* Fri May 01 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-4.sme
+- add SSLHonorCipherOrder Directive  [SME: 10916]
+
+* Tue Dec 10 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-3.sme
+- update apache icon path [SME: 9591]
+
+* Wed Mar 23 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-2.sme
+- fix syntax preventing httpd to launch [SME: 9364]
+- moved changelog at end of file
 
 * Thu Feb 4 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-1.sme
 - Roll new stream for sme10
@@ -599,26 +649,3 @@ e-smith server and gateway software - ap
 - [0.1.0-01]
 - Initial release, split out from e-smith-base [markk 6428]
 
-%prep
-%setup
-
-%build
-perl createlinks
-
-%install
-rm -rf $RPM_BUILD_ROOT
-(cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
-
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
-    --dir /var/service/httpd-e-smith 'attr(01755,root,root)' \
-    --file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \
-    --file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \
-    > e-smith-%{version}-filelist
-
-echo "%doc COPYING"          >> e-smith-%{version}-filelist
-
-%clean 
-rm -rf $RPM_BUILD_ROOT
-
-%files -f e-smith-%{version}-filelist
-%defattr(-,root,root)