--- rpms/e-smith-LPRng/sme8/e-smith-LPRng.spec	2008/04/27 16:24:51	1.5
+++ rpms/e-smith-LPRng/sme8/e-smith-LPRng.spec	2008/10/07 18:43:04	1.7
@@ -1,24 +1,19 @@
+# $Id$
+
 Summary: e-smith server and gateway - LPRng module
 %define name e-smith-LPRng
 Name: %{name}
-%define version 1.14.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-LPRng-1.14.0-use_client_driver.patch
-Patch1: e-smith-LPRng-1.14.0-create_all.patch
-Patch2: e-smith-LPRng-1.14.0-atalk.patch
-Patch3: e-smith-LPRng-1.14.0.badTerms.patch
-Patch4: e-smith-LPRng-1.14.0-tags2general.patch
-Patch5: e-smith-LPRng-1.14.0-fixADD.patch
-Patch6: e-smith-LPRng-1.14.0-add2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base, LPRng
 Requires: e-smith-lib >= 1.15.1-19
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 BuildArchitectures: noarch
 AutoReqProv: no
@@ -28,8 +23,11 @@ e-smith server and gateway software - LP
 Add printing features, using the LPRng package.
 
 %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.14.0-9
-- Add common <base> tags to e-smith-formmagick's general
+- Add common <base> tags to e-smith-formmagick's general [SME: 4291]
 
 * Wed Mar 12 2008 Shad L. Lords <slords@mail.com> 1.14.0-8
 - Cleanup CREATE/ADD tag mixup [SME: 4045]
@@ -535,13 +533,6 @@ Add printing features, using the LPRng p
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 perl createlinks