--- rpms/e-smith-viewlogfiles/sme8/e-smith-viewlogfiles.spec	2008/02/13 22:51:46	1.8
+++ rpms/e-smith-viewlogfiles/sme8/e-smith-viewlogfiles.spec	2008/10/07 19:25:24	1.12
@@ -1,19 +1,15 @@
+# $Id$
+
 Summary: Web manager panel to provide view access to log files
 %define name e-smith-viewlogfiles
 Name: %{name}
-%define version 1.8.0
-%define release 9
+%define version 2.2.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-viewlogfiles-1.8.0.squid_timestamps.patch
-Patch1: e-smith-viewlogfiles-1.8.0.qpsmtpd.state.patch
-Patch2: e-smith-viewlogfiles-1.8.0.more_exclusions.patch
-Patch3: e-smith-viewlogfiles-1.8.0-show_filename.patch
-Patch4: e-smith-viewlogfiles-1.8.0-rmFormTitle.patch
-Patch5: e-smith-viewlogfiles-1.8.0-tags2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
@@ -21,16 +17,25 @@ Requires: e-smith-base
 Requires: e-smith-lib >= 1.13.1-58
 Requires: perl
 Requires: perl(CGI::FormMagick)
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 Requires: perl(Time::TAI64)
 AutoReqProv: no
 
 %changelog
+* 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]
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.8.0-11
+- Add common <base> tags to e-smith-formmagick's general [SME: 4281]
+
+* Wed Mar 12 2008 Shad L. Lords <slords@mail.com> 1.8.0-10
+- Remove tests for removed FORM_TITLE's [SME: 4050]
+
 * Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.8.0-9
 - Remove <base> tags now in general [SME: 3916]
 
 * Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.8.0-8
-- Remove duplicate <base> entries [SME: 3893]
+- Remove duplicate <base> entries [SME: 3891]
 
 * Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.8.0-7
 - show log filename on panel [SME: 2770]
@@ -331,12 +336,6 @@ Insert an e-smith-manager web panel to a
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 perl createlinks