--- rpms/smeserver-thinclient/contribs10/smeserver-thinclient.spec	2022/06/30 04:45:51	1.5
+++ rpms/smeserver-thinclient/contribs10/smeserver-thinclient.spec	2022/07/01 01:23:05	1.8
@@ -1,4 +1,4 @@
-# $Id: smeserver-thinclient.spec,v 1.4 2022/05/09 21:41:27 trevorb Exp $
+# $Id: smeserver-thinclient.spec,v 1.7 2022/07/01 01:06:51 trevorb Exp $
 # Authority: nocvs
 # Name: Trevor Batley
 
@@ -17,8 +17,6 @@ BuildArch: noarch
 Requires: e-smith-base, smeserver-pxe
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReq: yes
-Patch1: smeserver-thinclient-2.2-migrate_DB_open_RW.patch
-Patch2: smeserver-thinclient-2.2-12085-workstation_trigger_update.patch
 
 %description
 Manage diskless workstation/device booting over network. 
@@ -29,8 +27,6 @@ Requires sme server to be acting as the
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1
-%patch2 -p1
 
 %build
 perl createlinks
@@ -57,7 +53,8 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 
 %changelog
-* Thu June 30 2020 Trevor Batley <trevor@batley.id.au> 2.2-3.sme
+* Fri Ju1 1 2022 Trevor Batley <trevor@batley.id.au> 2.2-3.sme
+- consolidate patches etc. and replace tarball
 - trigger update event on all save of workstation [SME 12085]
 - move templates2expand and services2adjust into createlinks [SME 12086]
 - move changelog in spec to end