--- rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/07/12 11:29:51	1.12
+++ rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/08/02 05:52:32	1.18
@@ -1,10 +1,10 @@
-# $Id: smeserver-mediawiki.spec,v 1.11 2022/06/08 12:13:07 brianr Exp $
+# $Id: smeserver-mediawiki.spec,v 1.17 2022/08/02 05:45:21 jpp Exp $
 # Authority: ber_die
 # Name: Dietmar Berteld
 
 %define name smeserver-mediawiki
 %define version 1.38.2
-%define release 1
+%define release 2
 
 Summary:       Mediawiki Web Application for SME Server 7.x based on Mediawiki 1.38.0
 Name:          %{name}
@@ -14,14 +14,15 @@ License:       GPL
 Group:         /Web/Applications
 Source:        %{name}-%{version}.tar.gz
 
-#Patch0:        smeserver-mediawiki-1.38.1-Fix-sql-create.patch
-#Patch0:        smeserver-mediawiki-1.37.2-Fix-up-password-generation-and-localsettings.patch
-#Patch1:        smeserver-mediawiki-1.6.10-Update-to-SME10.patch
+Patch0:        smeserver-mediawiki-1.38.2-bz12133-httpd24.patch
+Patch1:        smeserver-mediawiki-1.38.2-bz12134-backup.patch
 
 URL:           http://mediawiki.org/
 BuildRoot:     /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch:     noarch
 Requires:      e-smith-base, e-smith-release >= 10
+Requires:      e-smith-apache >= 2.6.0-19
+Requires:      smeserver-php >= 3.0.0-43
 BuildRequires: e-smith-devtools
 
 %description
@@ -33,9 +34,13 @@ After installation open your webbrowser
 http://your_e-smith-server_adress/wiki
 
 %changelog
+* Tue Aug 02 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.38.2-2.sme
+- update to httpd 2.4 access syntax [SME: 12133]
+- add to core backup [SME: 12134]
+
 * Tue Jul 12 2022 Brian Read <brianr@bjsystems.co.uk> 1.38.2-1.sme
-- Update version to Mediawiki-1.38.1 [sme: 11987]
-- Fix initial admin user
+- Update version to Mediawiki-1.38.2 [sme: 11987]
+- Fix initial admin user password
 
 * Thu Jun 09 2022 Brian Read <brianr@bjsystems.co.uk> 1.38.1-2.sme
 - fix sql user create [SME: 11987]
@@ -108,8 +113,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %setup
 
-#%patch0 -p1
-#%patch1 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 perl createlinks
@@ -150,7 +155,7 @@ esac
 APP=MediaWiki
 URL=wiki
 WORKDIR=/root
-MEDIAWIKIVERSION='1.38.1'
+MEDIAWIKIVERSION='1.38.2'
 INSTALLDIR=/usr/share/doc/mediawiki-$MEDIAWIKIVERSION/Sources
 HTMLDIR=/opt/mediawiki
 MYSQLDB=mediawiki
@@ -212,6 +217,7 @@ case $UPDATE in
     echo "Creating MySQL User and DataBase..."
     mysqladmin -u root create $MYSQLDB
     mysql $MYSQLDB < $INSTALLDIR/$MYSQLDB.sql
+    mysql $MYSQLDB -e "UPDATE user SET user_password = MD5( CONCAT( user_id, '-', MD5( 'mediawikiadmin' ) ) ) WHERE user_id =1 "
     mysql -u root -e "SET PASSWORD FOR $MYSQLUSER@localhost = PASSWORD( '$MYSQLPASS' ) "
     mysqladmin flush-privileges
     ;;
@@ -266,7 +272,7 @@ echo "For more details, see http://wiki.
 echo "-------------------------------------------------------------------------------"
 
 %preun
-MEDIAWIKIVERSION='1.38.1'
+MEDIAWIKIVERSION='1.38.2'
 INSTALLDIR=/usr/share/doc/mediawiki-$MEDIAWIKIVERSION/Sources
 if [ $1 = 0 ] ; then
   mv $INSTALLDIR/DO_NOT_USE_OR_DELETE/MW-Full-Uninstall.sh /root/