--- rpms/e-smith-viewlogfiles/sme7/e-smith-viewlogfiles.spec	2007/10/03 18:33:20	1.2
+++ rpms/e-smith-viewlogfiles/sme7/e-smith-viewlogfiles.spec	2008/10/07 19:25:24	1.12
@@ -1,15 +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 4
+%define version 2.0.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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
@@ -17,10 +17,35 @@ 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-12
 Requires: perl(Time::TAI64)
 AutoReqProv: no
 
 %changelog
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.0.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: 3891]
+
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.8.0-7
+- show log filename on panel [SME: 2770]
+
+* Mon Dec 24 2007 Stephen Noble <support@dungog.net> 1.8.0-6
+- remove viewlogfile.orig [SME: 3647]
+
+* Wed Oct 31 2007 Charlie Brady <charlie_brady@mitel.com> 1.8.0-5
+- Exclude svlogd config and btmp files. [SME: 3486]
+
 * Mon Oct 01 2007 Charlie Brady <charlie_brady@mitel.com> 1.8.0-4
 - Allow viewing of qpsmtpd/state. [SME: 3416]
 
@@ -311,8 +336,6 @@ Insert an e-smith-manager web panel to a
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
 
 %build
 perl createlinks