From a34149a1e36b39a309b9f163e221abc0caf01480d96a0d4281f07e85d991361a Mon Sep 17 00:00:00 2001
From: Eric Schirra <ecsos@schirra.net>
Date: Thu, 25 Jul 2019 15:44:51 +0000
Subject: [PATCH] Accepting request 718588 from home:ecsos:server

- Update to 3.11.0
  This release includes security improvements (including a security
  fix) and also several performance improvements and bug fixes.
  Details: https://matomo.org/changelog/matomo-3-11-0/
- Fix fileintegritycheck under systemcheck.

OBS-URL: https://build.opensuse.org/request/show/718588
OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=35
---
 matomo-3.10.0.tar.gz |  3 ---
 matomo-3.11.0.tar.gz |  3 +++
 matomo.changes       |  9 +++++++++
 matomo.spec          | 19 +++++++++++++++++--
 4 files changed, 29 insertions(+), 5 deletions(-)
 delete mode 100644 matomo-3.10.0.tar.gz
 create mode 100644 matomo-3.11.0.tar.gz

diff --git a/matomo-3.10.0.tar.gz b/matomo-3.10.0.tar.gz
deleted file mode 100644
index 4be86ef..0000000
--- a/matomo-3.10.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f726113faf3a64ecf9042eaaf3492d40242a146999941ccfece0d03b9b0f8d7
-size 16804140
diff --git a/matomo-3.11.0.tar.gz b/matomo-3.11.0.tar.gz
new file mode 100644
index 0000000..d45a3cc
--- /dev/null
+++ b/matomo-3.11.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:189056c5b5308595694d332a9feb19f42b26fbf51c8c8a53756d44fd7fad76b9
+size 16860544
diff --git a/matomo.changes b/matomo.changes
index 6d5c581..5a82466 100644
--- a/matomo.changes
+++ b/matomo.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jul 25 06:16:08 UTC 2019 - ecsos@opensuse.org
+
+- Update to 3.11.0
+  This release includes security improvements (including a security
+  fix) and also several performance improvements and bug fixes.
+  Details: https://matomo.org/changelog/matomo-3-11-0/
+- Fix fileintegritycheck under systemcheck.
+
 -------------------------------------------------------------------
 Thu Jul  4 06:15:04 UTC 2019 - ecsos@opensuse.org
 
diff --git a/matomo.spec b/matomo.spec
index 953971e..376bf7b 100644
--- a/matomo.spec
+++ b/matomo.spec
@@ -31,7 +31,7 @@
 %endif
 
 Name:           matomo
-Version:        3.10.0
+Version:        3.11.0
 Release:        0
 Summary:        Web analytics platform
 License:        GPL-3.0-or-later
@@ -91,9 +91,24 @@ install -m644 %{SOURCE4} README.SUSE
 # remove unwanted files
 find . -type f "(" -name .htaccess -o -name .travis.sh ")" -delete
 #find . -name ".git*" -exec rm -Rf "{}" "+"
-find . -type f "(" -name "*.c" -o -name "*.h" ")" -delete
+find . -type f "(" -name "*.c" -o -name "*.h" -o -name "*.js.orig" ")" -delete
 # env-script-interpreter
 find . -type f -exec sed -i -e 's|\/usr\/bin\/env php|\/usr\/bin\/php|g' {} +
+#
+# Fix integrity check triggered from fix of rpmlint errors.
+# Drop moved files
+for i in CHANGELOG.md CONTRIBUTING.md PRIVACY.md README.md SECURITY.md LEGALNOTICE LICENSE 'misc\/cron\/.htaccess' 'misc\/How to install Matomo.html' 'vendor\/tecnickcom\/tcpdf\/tools\/.htaccess' 'vendor\/twig\/twig\/ext\/twig\/php_twig.h' 'vendor\/twig\/twig\/ext\/twig\/twig.c' 'js\/piwik.js.orig'
+do
+  sed -i "/\W\"${i}\"\W/d" config/manifest.inc.php
+done
+# Insert new hashes for chanded files
+for file in console 'vendor/leafo/lessphp/plessc' 'vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php'
+do
+  size=$(ls -l $file | awk '{ print $5 }')
+  checksum=$(md5sum $file  | awk '{ print $1 }')
+  file2=$(echo "$file" | sed 's/\//\\\//g')
+  sed -i "/\W\"$file2\"\W/c \"$file\" => array(\"$size\", \"$checksum\")," config/manifest.inc.php
+done
 
 %build
 # nothing to build