--- rpms/e-smith-apache/sme8/e-smith-apache.spec	2007/06/12 18:23:44	1.1
+++ rpms/e-smith-apache/sme8/e-smith-apache.spec	2009/03/07 21:04:27	1.8
@@ -1,20 +1,16 @@
 Summary: e-smith server and gateway - apache module
 %define name e-smith-apache
 Name: %{name}
-%define version 1.2.0
-%define release 13
+%define version 2.2.0
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-apache-1.2.0-ProxyPassVirtualHosts.patch
-Patch1: e-smith-apache-1.2.0-no_ManagerProxyPass.patch
-Patch2: e-smith-apache-1.2.0-SSLCertificateChainFile.patch
-Patch3: e-smith-apache-1.2.0-logrotate.patch
-Patch4: e-smith-apache-1.2.0-load_module.patch
-Patch5: e-smith-apache-1.2.0-skipdomain.patch
-Patch6: e-smith-apache-1.2.0-lib64.patch
+Patch0: e-smith-apache-2.2.0-AddOffice2007MIMETypes.patch
+Patch1: e-smith-apache-2.2.0-AddOpenOfficeMIMETypes.patch
+Patch2: e-smith-apache-2.2.0-AddXMLMIMEType.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.15.1
@@ -30,6 +26,28 @@ BuildRequires: e-smith-devtools >= 1.11.
 e-smith server and gateway software - apache module.
 
 %changelog
+* Sat Mar  7 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-4.sme
+- Add OpenOffixe MIME Types [SME: 4848]
+- Add XML MIME Type [SME: 5035]
+
+* Thu Dec 11 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-3.sme
+- Fix issues in patch that adds Microsoft Office 2007 MIME types [SME: 4548]
+
+* Tue Dec 2 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-2.sme
+- Add Microsoft Office 2007 MIME types [SME: 4548]
+
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Tue Oct 23 2007 Filippo Carletti <filippo.carletti@gmail.com> 1.2.0-16
+- Add SSL support to ProxyPass. [SME: 3481]
+
+* Tue Sep 11 2007 Gavin Weight <gweight@gmail.com> 1.2.0-15
+- Create/Move httpd logrotate.d directory. [SME: 3380]
+
+* Tue Sep 11 2007 Gavin Weight <gweight@gmail.com> 1.2.0-14
+- Rename apache to httpd in templates2expand. [SME: 3380]
+
 * Wed Jun 6 2007 Shad L. Lords <slords@mail.com> 1.2.0-13
 - Fix patch to exclude hosts if domains exist [SME: 2307]
 
@@ -514,10 +532,6 @@ e-smith server and gateway software - ap
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %pre