--- rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/01 09:29:22	1.3
+++ rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/01 13:23:19	1.6
@@ -1,18 +1,21 @@
-# $Id: smeserver-mediawiki.spec,v 1.2 2022/06/01 09:14:52 brianr Exp $
+# $Id: smeserver-mediawiki.spec,v 1.5 2022/06/01 12:12:19 brianr Exp $
 # Authority: ber_die
 # Name: Dietmar Berteld
 
 %define name smeserver-mediawiki
+<<<<<<< smeserver-mediawiki.spec
 %define version 1.37.2
-%define release 1
+%define release 2
+======
 
+>>>>>>> 1.5
 Summary:       Mediawiki Web Application for SME Server 7.x based on Mediawiki 1.37.2
 Name:          %{name}
 Version:       %{version}
 Release:       %{release}%{?dist}
 License:       GPL
 Group:         /Web/Applications
-Source:        %{name}-%{version}.tar.gz
+Source:        %{name}-%{version}-1.tar.gz
 #Patch0:        smeserver-mediawiki-1.6.10-1.patch
 #Patch1:        smeserver-mediawiki-1.6.10-Update-to-SME10.patch
 
@@ -31,10 +34,16 @@ After installation open your webbrowser
 http://your_e-smith-server_adress/wiki
 
 %changelog
+* Wed Jun 01 2022 BogusDateBot
+- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
+  by assuming the date is correct and changing the weekday.
+  Thu Oct 23 2007 --> Thu Oct 18 2007 or Tue Oct 23 2007 or Thu Oct 25 2007 or ....
+  Thu Feb 26 2008 --> Thu Feb 21 2008 or Tue Feb 26 2008 or Thu Feb 28 2008 or ....
+
 * 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
+- Update to mw 1.37.2
 
 * Mon May 12 2008 Dietmar Berteld> 1.6.10-9
 - Disabing automatic creation of SME groups. No idea to synchronise them to mediawiki groups.
@@ -45,10 +54,12 @@ http://your_e-smith-server_adress/wiki
   configuration file as well so admins only need to add users to the proper
   groups in the server-manager
 
-* Thu Feb 26 2008 Dietmar Berteld>
+* Tue Feb 26 2008 Dietmar Berteld>
+  Thu Feb 26 2008 --> Thu Feb 21 2008 or Tue Feb 26 2008 or Thu Feb 28 2008 or ....
 - [1.6.10-7] Fixed httpd-settings for local access only
 
-* Thu Oct 23 2007 Dietmar Berteld>
+* Tue Oct 23 2007 Dietmar Berteld>
+  Thu Oct 23 2007 --> Thu Oct 18 2007 or Tue Oct 23 2007 or Thu Oct 25 2007 or ....
 - [1.6.10-6] Fixed automated uninstall issue for MySQL-DB and MySQL-user
 
 * Fri Oct 19 2007 Dietmar Berteld>
@@ -178,7 +189,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,7 +206,7 @@ echo "Applying modifications to services
 sed 's.#!..g' $HTMLDIR/LocalSettings.php > $HTMLDIR/LocalSettings2.php
 mv $HTMLDIR/LocalSettings2.php $HTMLDIR/LocalSettings.php
 /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-/usr/local/bin/svc -h /service/httpd-e-smith
+systemctl restart httpd-e-smith.service
 echo "-------------------------------------------------------------------------------"
 case $UPDATE in
   0)
@@ -226,7 +237,7 @@ echo "    # config setprop $MYSQLDB Publ
 echo " "
 echo "Don't forget to apply modifications with following commands:"
 echo "    # expand-template /etc/httpd/conf/httpd.conf"
-echo "    # svc -h /service/httpd-e-smith"
+echo "    # systemctl restart httpd-e-smith.service"
 echo " "
 echo "For more details, see http://wiki.contribs.org/Mediawiki"
 echo "-------------------------------------------------------------------------------"