--- rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/05/31 02:55:04	1.1
+++ rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/01 09:14:52	1.2
@@ -1,12 +1,12 @@
-# $Id: smeserver-mediawiki.spec,v 1.1 2013/03/03 04:58:08 unnilennium Exp $
+# $Id: smeserver-mediawiki.spec,v 1.1 2022/05/31 02:55:04 jpp Exp $
 # Authority: ber_die
 # Name: Dietmar Berteld
 
 %define name smeserver-mediawiki
 %define version 1.6.10
-%define release 9
+%define release 10
 
-Summary:       Mediawiki Web Application for SME Server 7.x based on Mediawiki 1.6.10
+Summary:       Mediawiki Web Application for SME Server 7.x based on Mediawiki 1.37.2
 Name:          %{name}
 Version:       %{version}
 Release:       %{release}%{?dist}
@@ -14,6 +14,8 @@ License:       GPL
 Group:         /Web/Applications
 Source:        %{name}-%{version}.tar.gz
 Patch0:        smeserver-mediawiki-1.6.10-1.patch
+Patch1:        smeserver-mediawiki-1.6.10-Update-to-SME10.patch
+
 URL:           http://mediawiki.org/
 BuildRoot:     /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch:     noarch
@@ -29,6 +31,11 @@ After installation open your webbrowser
 http://your_e-smith-server_adress/wiki
 
 %changelog
+* Tue May 31 2022 Brian Read <brianr@bjsystems.co.uk> 1.6.10-10.sme
+- Update to SME10 [SME:11987]
+- Add php-fpm stuff to httpd.conf
+- Add in createlinks
+
 * Mon May 12 2008 Dietmar Berteld> 1.6.10-9
 - Disabing automatic creation of SME groups. No idea to synchronise them to mediawiki groups.
 
@@ -73,6 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %setup
 
 %patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -128,12 +136,12 @@ rm -rf lang*
 #Untar application
 echo "Decompressing files..."
 mkdir -p $HTMLDIR
-tar xzf $INSTALLDIR/mediawiki-1.6.10.tar.gz -C /opt
+tar xzf $INSTALLDIR/mediawiki-1.37.2.tar.gz -C /opt
 case $UPDATE in
-   0) mv -f /opt/mediawiki-1.6.10/* $HTMLDIR ;;
-   *) cp -ufR /opt/mediawiki-1.6.10/* $HTMLDIR --reply=yes ;;
+   0) mv -f /opt/mediawiki-1.37.2/* $HTMLDIR ;;
+   *) cp -ufR /opt/mediawiki-1.37.2/* $HTMLDIR --reply=yes ;;
 esac
-rm -rf /opt/mediawiki-1.6.10
+rm -rf /opt/mediawiki-1.37.2
 cp $INSTALLDIR/sme.* $HTMLDIR/skins/common/images
 #Prepare config settings
 sed 's.mediawikipassword.'$MYSQLPASS'.g' $INSTALLDIR/LocalSettings.php > $HTMLDIR/LocalSettings.php
@@ -170,7 +178,7 @@ case $UPDATE in
   0)
     echo "Creating MySQL User and DataBase..."
     mysqladmin -u root create $MYSQLDB
-    mysql $MYSQLDB < $INSTALLDIR/$MYSQLDB.sql
+    #mysql $MYSQLDB < $INSTALLDIR/$MYSQLDB.sql
     mysql -u root -e "SET PASSWORD FOR $MYSQLUSER@localhost = PASSWORD( '$MYSQLPASS' ) "
     mysqladmin flush-privileges
     ;;
@@ -195,8 +203,8 @@ case $UPDATE in
     echo "Reminder:"
     echo "- Website open globally"
     echo "- go to http://$DOMAIN/$URL"
-    echo "- Usernames are identical with SME users"
-    echo "- Passwords are identical with SME passwords"
+    #echo "- Usernames are identical with SME users"
+    #echo "- Passwords are identical with SME passwords"
     echo "- MediaWiki admin = SME admin"
     ;;
   *)
@@ -206,8 +214,8 @@ case $UPDATE in
     echo "  PLEASE MOVE THIS DIRECTORY TO A SAFE PLACE!!!"
     echo "- Website open globally"
     echo "- go to http://$DOMAIN/$URL"
-    echo "- Usernames are identical with SME users"
-    echo "- Passwords are identical with SME passwords"
+    #echo "- Usernames are identical with SME users"
+    #echo "- Passwords are identical with SME passwords"
     echo "- MediaWiki admin = SME admin"
     ;;
 esac
@@ -233,7 +241,8 @@ fi
 if [ $1 = 0 ] ; then
   echo "Restarting services..."
   /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-  /usr/local/bin/svc -h /service/httpd-e-smith
+  #/usr/local/bin/svc -h /service/httpd-e-smith
+  systemctl restart httpd-e-smith.service
   echo " "
   echo "Uninstallation finished!"
   echo "If you want to completly remove it (installation files and MySQL user+database)"