From 9dcd9f699334f870f4c9fc6807e1fedeca54d0def9407f4edbab8fb409a481a4 Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Tue, 20 Nov 2018 16:22:56 +0000
Subject: [PATCH] Accepting request 650539 from home:ecsos:server

smal changes to build for 42.3

OBS-URL: https://build.opensuse.org/request/show/650539
OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=15
---
 matomo.spec | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/matomo.spec b/matomo.spec
index 04f9592..7ad5c96 100644
--- a/matomo.spec
+++ b/matomo.spec
@@ -46,17 +46,16 @@ Source11:       %{name}-archive.service
 Source12:       %{name}-archive.timer
 Source99:       %{name}.rpmlintrc
 BuildArch:      noarch
-Requires(post): shadow
-Requires(post): user(wwwrun)
-Requires(post): group(www)
+#Requires(post): user(wwwrun)
+#Requires(post): group(www)
 BuildRequires:  apache2-devel
 BuildRequires:  cron
 BuildRequires:  fdupes
 BuildRequires:  logrotate
 BuildRequires:  mariadb
-BuildRequires:  php-json
-BuildRequires:  php-mbstring
-BuildRequires:  php-pdo
+#BuildRequires:  php-json
+#BuildRequires:  php-mbstring
+#BuildRequires:  php-pdo
 BuildRequires:  systemd
 BuildRequires:  unzip
 Requires:       apache2
@@ -139,11 +138,11 @@ chown -R %{ap_usr}:%{ap_grp} %{ap_serverroot}/%{name}
 # Update matomo if this is an upgrade $1 == 2
 echo "matomo: Update matomo:core..."
 if [ $1 -gt 1 ]; then
-  su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'Tracker.record_statistics="0"'"
-  su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'General.maintenance_mode="1"'"
+  su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'Tracker.record_statistics="0"'" || :
+  su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'General.maintenance_mode="1"'" || :
   su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console core:update --yes" || :
-  su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'General.maintenance_mode="0"'"
-  su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'Tracker.record_statistics="1"'"
+  su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'General.maintenance_mode="0"'" || :
+  su wwwrun -s /bin/sh -c "%{_bindir}/php %{ap_serverroot}/%{name}/console config:set 'Tracker.record_statistics="1"'" || :
   :
 fi