--- rpms/e-smith-proftpd/sme7/e-smith-proftpd.spec	2007/06/12 16:02:26	1.1
+++ rpms/e-smith-proftpd/sme7/e-smith-proftpd.spec	2008/10/07 19:13:44	1.6
@@ -1,19 +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 8
+%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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
@@ -23,6 +19,19 @@ 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]
+
+* Tue Jun 26 2007 Gavin Weight <gweight@gmail.com> 1.12.0-9
+- Create pam.d directory and move ftp/proftpd templates into pam.d.
+[SME: 2762]
+
 * Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
 - Clean up spec so package can be built by koji/plague
 
@@ -495,12 +504,6 @@ Configuration files and templates for th
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 %build
 perl createlinks
@@ -520,6 +523,13 @@ mkdir -p root/var/service/proftpd/peers
 mkdir -p root/etc/e-smith/templates/var/service/proftpd/peers/{0,local}
 touch root/etc/e-smith/templates/var/service/proftpd/peers/{0,local}/template-begin
 
+for file in ftp proftpd
+do
+    mkdir -p root/etc/e-smith/templates/etc/pam.d/$file
+    ln -s /etc/e-smith/templates-default/template-begin-pam \
+      root/etc/e-smith/templates/etc/pam.d/$file/template-begin
+done
+
 %install
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)