upgrading package: matomo 3.11.0 -> 3.12.0

matomo/matomo.patch

@@ -1,25 +1,16 @@
 Index: config/manifest.inc.php
---- config/manifest.inc.php.orig	2019-07-01 13:28:52.000000000 +0200
-+++ config/manifest.inc.php	2019-07-02 08:17:29.501675000 +0200
-@@ -733,7 +733,7 @@
- 		"libs/bower_components/html5shiv/dist/html5shiv-printshiv.js" => array("16268", "87ab03595191d555da6261d11d2b2e32"),
- 		"libs/bower_components/html5shiv/dist/html5shiv-printshiv.min.js" => array("4366", "9f03100ab5ce18e0049c25c6c4916802"),
- 		"libs/bower_components/html5shiv/Gruntfile.js" => array("1177", "a6418754499f873e31aff73c8d2dc8e3"),
--		"libs/bower_components/html5shiv/MIT and GPL2 licenses.md" => array("19536", "4fc1cec955f1323ade785dffe7c87d22"),
-+		"libs/bower_components/html5shiv/MIT-and-GPL2-licenses.md" => array("19536", "4fc1cec955f1323ade785dffe7c87d22"),
- 		"libs/bower_components/html5shiv/package.json" => array("352", "53e1a50f0c8a4773dab7926bdb37da37"),
- 		"libs/bower_components/html5shiv/readme.md" => array("8391", "f171e499e475e391e1ad0bdc49175863"),
- 		"libs/bower_components/iframe-resizer/bower.json" => array("1011", "f16521c77ed7dac9a5cda1a0592ce485"),
-@@ -1438,7 +1438,7 @@
+--- config/manifest.inc.php.orig	2019-10-29 05:44:58.000000000 +0100
++++ config/manifest.inc.php	2019-10-29 19:19:32.968805000 +0100
+@@ -1142,7 +1142,7 @@
+ 		"misc/cron/archive.sh" => array("1231", "a8614267f1c30506126480621f5f4fcf"),
  		"misc/cron/.htaccess" => array("103", "9430d4c88b1d229030349569fefc7b35"),
- 		"misc/cron/updatetoken.php" => array("1835", "beb0978225abf68c8160fb8bfbb5aa2b"),
- 		"misc/gpl-3.0.txt" => array("35149", "1ebbd3e34237af26da5dc08a4e440464"),
+ 		"misc/cron/updatetoken.php" => array("1751", "510b084449c64c27435640d22e235f7b"),
 -		"misc/How to install Matomo.html" => array("341", "ba1d7c94ccc5ceff13ab4cd2b59d07d0"),
 +		"misc/How-to-install-Matomo.html" => array("341", "ba1d7c94ccc5ceff13ab4cd2b59d07d0"),
  		"misc/log-analytics/CONTRIBUTING.md" => array("349", "7992f705ce8c7f34fc1f995293a37ecd"),
  		"misc/log-analytics/import_logs.py" => array("105343", "f2766745cc5dc97553dc6a749c941c53"),
  		"misc/log-analytics/LEGALNOTICE" => array("673", "14274b30750d923df08a2cc2dca6b261"),
-@@ -4264,7 +4264,7 @@
+@@ -3895,7 +3895,7 @@
  		"plugins/Morpheus/icons/dist/brand/Cat.png" => array("374", "77f3314a14ebb993c26f6c324787de97"),
  		"plugins/Morpheus/icons/dist/brand/Celkon.png" => array("223", "9ea5316b77c801995d39fc1cbff51005"),
  		"plugins/Morpheus/icons/dist/brand/Cherry_Mobile.png" => array("398", "56e895fff2d0c9e606dac34de4a0e4c7"),

matomo/matomo.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        Web
 License:      GPL
-Version:      3.11.0
-Release:      20190724
+Version:      3.12.0
+Release:      20191029
 
 #   list of sources
 Source0:      http://builds.matomo.org/piwik-%{version}.zip
@@ -76,13 +76,13 @@ PreReq:       mysql
     }
 
 %prep
-    %setup -q -n piwik
-    %patch -p0
+    %setup -q -T -c
+    unzip -q -x %{SOURCE0}
+    %patch -p0 -d piwik
 
 %build
     #   rename problematic files
-    mv  "libs/bower_components/html5shiv/MIT and GPL2 licenses.md" \
-        "libs/bower_components/html5shiv/MIT-and-GPL2-licenses.md"
+    cd piwik
     mv  "plugins/Morpheus/icons/dist/brand/China Mobile.png" \
         "plugins/Morpheus/icons/dist/brand/China_Mobile.png"
     mv  "misc/How to install Matomo.html" \
@@ -90,6 +90,7 @@ PreReq:       mysql
 
 %install
     #   create installation hierarchy
+    cd piwik
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/sbin \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
@@ -137,7 +138,7 @@ PreReq:       mysql
         $RPM_BUILD_ROOT%{l_prefix}/etc/matomo/
 
     #   determine installation files
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+    %{l_rpmtool} files -v -o../files -r$RPM_BUILD_ROOT \
         %{l_files_std} \
         '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/etc/matomo' \
         '%config %attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/etc/matomo/*' \