--- rpms/smeserver-wordpress/contribs10/smeserver-wordpress.spec	2021/03/07 11:06:19	1.2
+++ rpms/smeserver-wordpress/contribs10/smeserver-wordpress.spec	2021/03/12 12:25:50	1.3
@@ -1,10 +1,10 @@
-# $Id: smeserver-wordpress.spec,v 1.1 2021/03/06 07:39:54 brianr Exp $
+# $Id: smeserver-wordpress.spec,v 1.2 2021/03/07 11:06:19 brianr Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 %define name smeserver-wordpress
 %define version 1.2
-%define release 10
+%define release 11
 Summary: smserver rpm to setup mysql database and web link for wordpress weblog
 Name: %{name}
 Version: %{version}
@@ -17,14 +17,19 @@ BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 BuildRequires: e-smith-devtools
 Requires: e-smith-release >= 9.0
-Requires: wordpress
+#Requires: wordpress
 AutoReqProv: no
 Patch0: smeserver-wordpress-1.2.NfrHttpdDirective.patch
 Patch1: smeserver-wordpress-1.2-Add-in-update-event-and-fix-php-fpw.patch
+Patch2: smeserver-wordpress-1.2-Remove-need-for-wordpress-rpm.patch
 %description
 smserver rpm to setup mysql database and web link for wordpress weblog
 
 %changelog
+* Tue Mar 09 2021 Brian Read <brianr@bjsystems.co.uk> 1.2-11.sme
+- Update wp-config.php with AUTO UPDATE and DIRECT download [SME: 11428]
+- Remove requirement for wordpress rpm, and set script to download and install
+
 * Sun Mar 07 2021 BogusDateBot
 - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
   by assuming the date is correct and changing the weekday.
@@ -126,6 +131,7 @@ smserver rpm to setup mysql database and
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %build
 perl createlinks
 
@@ -133,6 +139,7 @@ perl createlinks
 %install
 rm -rf $RPM_BUILD_ROOT
 (cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
+mkdir -p $RPM_BUILD_ROOT/etc/wordpress
 rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
     > %{name}-%{version}-filelist
@@ -149,6 +156,8 @@ rm -rf %{name}-%{version}
 %post
 
 %postun
+rm -fR /etc/wordpress
+rm -fR /usr/share/wordpress
 
 
 %files -f %{name}-%{version}-filelist