--- rpms/smeserver-thinclient/contribs10/smeserver-thinclient.spec	2022/05/09 21:41:27	1.4
+++ rpms/smeserver-thinclient/contribs10/smeserver-thinclient.spec	2022/07/01 01:34:41	1.9
@@ -1,12 +1,12 @@
-# $Id: smeserver-thinclient.spec,v 1.3 2022/04/30 02:49:07 trevorb Exp $
+# $Id: smeserver-thinclient.spec,v 1.8 2022/07/01 01:23:05 trevorb Exp $
 # Authority: nocvs
 # Name: Trevor Batley
 
-Summary: Allow pxeboot of Thin Client workstations over network
+Summary: Manage pxeboot of Thin Client workstations over network
 %define name smeserver-thinclient
 Name: %{name}
 %define version 2.2
-%define release 2
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,7 +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
 
 %description
 Manage diskless workstation/device booting over network. 
@@ -26,9 +25,42 @@ Basic PXE booting is enabled via smeserv
 A tftp server is reqired. Can be on sme server (eg smeserver-tftp) or elsewhere in network
 Requires sme server to be acting as the dhcp server
 
+%prep
+%setup -q -n %{name}-%{version}
+
+%build
+perl createlinks
+
+%install
+/bin/rm -rf $RPM_BUILD_ROOT
+(cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
+/bin/rm -f %{name}-%{version}-filelist
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
+
+%clean 
+rm -rf $RPM_BUILD_ROOT
+
+%files -f %{name}-%{version}-filelist
+
+%defattr(-,root,root)
+
+%pre
+
+%preun
+
+%post
+
+%postun
+
 %changelog
+* Fri Jul 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
+
 * Tue May 10 2022 Trevor Batley <trevor@batley.id.au> 2.2-2.sme
-* added missing migrate/00openRW fragment for thinslient DB [SME 11967]
+- added missing migrate/00openRW fragment for thinslient DB [SME 11967]
 
 * Thu Apr 28 2022 Trevor Batley <trevor@batley.id.au> 2.2-1.sme
 - added /etc/dhcpd.thinclient include file for pxe clients
@@ -144,31 +176,3 @@ Requires sme server to be acting as the
 * Sat Jan 24 2004 Trevor Batley <trevor@batley.id.au>
 - Initial release
   
-
-%prep
-%setup -q -n %{name}-%{version}
-%patch1 -p1
-
-%build
-perl createlinks
-
-%install
-/bin/rm -rf $RPM_BUILD_ROOT
-(cd root   ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
-/bin/rm -f %{name}-%{version}-filelist
-/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
-
-%clean 
-rm -rf $RPM_BUILD_ROOT
-
-%files -f %{name}-%{version}-filelist
-
-%defattr(-,root,root)
-
-%pre
-
-%preun
-
-%post
-
-%postun