--- rpms/e-smith-base/sme8/e-smith-base.spec	2007/09/08 00:55:22	1.9
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2007/09/17 17:48:56	1.10
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - ba
 %define name e-smith-base
 Name: %{name}
 %define version 4.18.0
-%define release 67
+%define release 69
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -62,6 +62,8 @@ Patch51: e-smith-base-4.18.0-devicechk.p
 Patch52: e-smith-base-4.18.0-conf_modules.patch
 Patch53: e-smith-base-4.18.0-restoredev.patch2
 Patch54: e-smith-base-4.18.0-groups.pm.pod.patch
+Patch55: e-smith-base-4.18.0-rename_apache2httpd.patch
+Patch56: e-smith-base-4.18.0-remove_httpd__logrotate.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-7
@@ -109,6 +111,12 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Tue Sep 11 2007 Gavin Weight <gweight@gmail.com> 4.18.0-69
+- Move httpd logrotate.d directory to e-smith-apache. [SME: 3380]
+
+* Tue Sep 11 2007 Gavin Weight <gweight@gmail.com> 4.18.0-68
+- Rename in logrotate.d directory apache to httpd. [SME: 3380]
+
 * Fri Sep 07 2007 Charlie Brady <charlie_brady@mitel.com> 4.18.0-67
 - Fix pod in groups.pm file. [SME: 3379]
 
@@ -1180,6 +1188,8 @@ e-smith server and gateway software - ba
 %patch52 -p1
 %patch53 -p1
 %patch54 -p1
+%patch55 -p1
+%patch56 -p1
 
 rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin
 rm -rf root/etc/e-smith/templates/etc/identd.masq