--- rpms/e-smith-proftpd/sme7/e-smith-proftpd.spec	2007/10/31 21:44:06	1.3
+++ rpms/e-smith-proftpd/sme7/e-smith-proftpd.spec	2008/10/07 19:13:44	1.6
@@ -1,21 +1,15 @@
+# $Id$
+
 Summary: e-smith specific proftpd configuration files and templates
 %define name e-smith-proftpd
 Name: %{name}
-%define version 1.12.0
-%define release 10
+%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-proftpd-1.12.0-LogDirPerms.patch
-Patch1: e-smith-proftpd-1.12.0-ftpusersfix.patch
-Patch2: e-smith-proftpd-1.12.0-chroot.patch
-Patch3: e-smith-proftpd-1.12.0-globalroot.patch
-Patch4: e-smith-proftpd-1.12.0-logdir.patch
-Patch5: e-smith-proftpd-1.12.0-ftpuser_perm.patch
-Patch6: e-smith-proftpd-1-12-0-MovePam_d_ftpTemplates.patch
-Patch7: e-smith-proftpd-1.12.0-RenameDisplayFirstChdirToDisplayChdir.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -25,6 +19,12 @@ Requires: iptables
 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]
+
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.12.0-11
+- ShowSymlinks off [SME: 993]
+
 * Wed Oct 31 2007 Gavin Weight <gweight@gmail.com> 1.12.0-10
 - Rename DisplayFirstChdir to DisplayChdir.  [SME: 3479]
 
@@ -504,14 +504,6 @@ Configuration files and templates for th
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
 
 %build
 perl createlinks