--- rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/01 13:23:19	1.6
+++ rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/03 09:35:35	1.10
@@ -1,22 +1,19 @@
-# $Id: smeserver-mediawiki.spec,v 1.5 2022/06/01 12:12:19 brianr Exp $
+# $Id: smeserver-mediawiki.spec,v 1.9 2022/06/01 13:28:34 brianr Exp $
 # Authority: ber_die
 # Name: Dietmar Berteld
 
 %define name smeserver-mediawiki
-<<<<<<< smeserver-mediawiki.spec
-%define version 1.37.2
-%define release 2
-======
+%define version 1.38.0
+%define release 1
 
->>>>>>> 1.5
-Summary:       Mediawiki Web Application for SME Server 7.x based on Mediawiki 1.37.2
+Summary:       Mediawiki Web Application for SME Server 7.x based on Mediawiki 1.38.0
 Name:          %{name}
 Version:       %{version}
 Release:       %{release}%{?dist}
 License:       GPL
 Group:         /Web/Applications
-Source:        %{name}-%{version}-1.tar.gz
-#Patch0:        smeserver-mediawiki-1.6.10-1.patch
+Source:        %{name}-%{version}.tar.gz
+#Patch0:        smeserver-mediawiki-1.37.2-Fix-up-password-generation-and-localsettings.patch
 #Patch1:        smeserver-mediawiki-1.6.10-Update-to-SME10.patch
 
 URL:           http://mediawiki.org/
@@ -34,6 +31,12 @@ After installation open your webbrowser
 http://your_e-smith-server_adress/wiki
 
 %changelog
+* Fri Jun 03 2022 Brian Read <brianr@bjsystems.co.uk> 1.38.0-1.sme
+- Rollup tar file to include mediawiki 1.38.0  [SME: 11987]
+
+* Wed Jun 01 2022 Brian Read <brianr@bjsystems.co.uk> 1.37.2-3.sme
+- Fix-up-password-generation-and-localsettings  [SME: 11987]
+
 * Wed Jun 01 2022 BogusDateBot
 - Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
   by assuming the date is correct and changing the weekday.
@@ -131,7 +134,8 @@ esac
 APP=MediaWiki
 URL=wiki
 WORKDIR=/root
-INSTALLDIR=/usr/share/doc/mediawiki-1.37.2/Sources
+MEDIAWIKIVERSION='1.38.0'
+INSTALLDIR=/usr/share/doc/mediawiki-$MEDIAWIKIVERSION/Sources
 HTMLDIR=/opt/mediawiki
 MYSQLDB=mediawiki
 MYSQLUSER=mediawikiuser
@@ -149,10 +153,10 @@ echo "Decompressing files..."
 mkdir -p $HTMLDIR
 tar xzf $INSTALLDIR/mediawiki-1.37.2.tar.gz -C /opt
 case $UPDATE in
-   0) mv -f /opt/mediawiki-1.37.2/* $HTMLDIR ;;
-   *) cp -ufR /opt/mediawiki-1.37.2/* $HTMLDIR --reply=yes ;;
+   0) mv -f /opt/mediawiki-$MEDIAWIKIVERSION/* $HTMLDIR ;;
+   *) cp -ufR /opt/mediawiki-$MEDIAWIKIVERSION/* $HTMLDIR --reply=yes ;;
 esac
-rm -rf /opt/mediawiki-1.37.2
+rm -rf /opt/mediawiki-$MEDIAWIKIVERSION
 cp $INSTALLDIR/sme.* $HTMLDIR/skins/common/images
 #Prepare config settings
 sed 's.mediawikipassword.'$MYSQLPASS'.g' $INSTALLDIR/LocalSettings.php > $HTMLDIR/LocalSettings.php
@@ -243,7 +247,7 @@ echo "For more details, see http://wiki.
 echo "-------------------------------------------------------------------------------"
 
 %preun
-INSTALLDIR=/usr/share/doc/mediawiki-1.37.2/Sources
+INSTALLDIR=/usr/share/doc/mediawiki-$MEDIAWIKIVERSION/Sources
 if [ $1 = 0 ] ; then
   mv $INSTALLDIR/DO_NOT_USE_OR_DELETE/MW-Full-Uninstall.sh /root/
 fi