--- rpms/smeserver-mediawiki/contribs10/smeserver-mediawiki.spec	2022/06/01 12:12:19	1.5
+++ 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.4 2022/06/01 09:30:30 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
-%define version 1.37.2-1
-%define release 1
+<<<<<<< smeserver-mediawiki.spec
+%define version 1.37.2
+%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