From d3c512d59088edf7af3717a2f6ddf83ff804b94f319b905372e3570031d92953 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Tue, 19 Dec 2023 12:06:12 +0000 Subject: [PATCH 1/2] Accepting request 1134019 from home:ecsos:server - Update to 5.0.0 Too many changes to list here. See instead: https://matomo.org/changelog/matomo-5-0-0/ - Rebase matomo-package_update.patch OBS-URL: https://build.opensuse.org/request/show/1134019 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=122 --- How to install Matomo.html | 8 ++++++++ matomo-4.16.0.tar.gz | 3 --- matomo-5.0.0.tar.gz | 3 +++ matomo-package_update.patch | 4 ++-- matomo.changes | 8 ++++++++ matomo.spec | 4 ++-- 6 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 How to install Matomo.html delete mode 100644 matomo-4.16.0.tar.gz create mode 100644 matomo-5.0.0.tar.gz diff --git a/How to install Matomo.html b/How to install Matomo.html new file mode 100644 index 0000000..86f0d49 --- /dev/null +++ b/How to install Matomo.html @@ -0,0 +1,8 @@ + + + + + +You will be redirected to the Matomo Analytics Installation documentation on matomo.org/docs/installation + + diff --git a/matomo-4.16.0.tar.gz b/matomo-4.16.0.tar.gz deleted file mode 100644 index a96bf39..0000000 --- a/matomo-4.16.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:385653e35f795935b0d97340c8688d8b15ba85234a0b72320696b990cf4f0959 -size 19844115 diff --git a/matomo-5.0.0.tar.gz b/matomo-5.0.0.tar.gz new file mode 100644 index 0000000..6f69ece --- /dev/null +++ b/matomo-5.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d72b74dced0a9a93295043646ba1fc4577aa4a7d282b46baf7898933f8bbff65 +size 20946285 diff --git a/matomo-package_update.patch b/matomo-package_update.patch index 0e31667..4c5120a 100644 --- a/matomo-package_update.patch +++ b/matomo-package_update.patch @@ -3,13 +3,13 @@ Index: matomo/plugins/CoreUpdater/Commands/Update.php --- matomo.orig/plugins/CoreUpdater/Commands/Update.php +++ matomo/plugins/CoreUpdater/Commands/Update.php @@ -79,8 +79,11 @@ class Update extends ConsoleCommand - $this->writeSuccessMessage($output, array(Piwik::translate('CoreUpdater_DbUpgradeNotExecuted'))); + $this->writeSuccessMessage(array(Piwik::translate('CoreUpdater_DbUpgradeNotExecuted'))); } + // Only show if autoupdate is enabled. Don't show if update through distribution package update. + $enableAutoUpdate = (bool) Config::getInstance()->General['enable_auto_update']; + if ($enableAutoUpdate === true){ - $this->writeAlertMessageWhenCommandExecutedWithUnexpectedUser($output); + $this->writeAlertMessageWhenCommandExecutedWithUnexpectedUser(); - + } diff --git a/matomo.changes b/matomo.changes index 5b77369..89ff8ae 100644 --- a/matomo.changes +++ b/matomo.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Dec 19 09:41:27 UTC 2023 - ecsos + +- Update to 5.0.0 + Too many changes to list here. See instead: + https://matomo.org/changelog/matomo-5-0-0/ +- Rebase matomo-package_update.patch + ------------------------------------------------------------------- Tue Nov 28 17:11:44 UTC 2023 - ecsos diff --git a/matomo.spec b/matomo.spec index 4be8e44..55e92b0 100644 --- a/matomo.spec +++ b/matomo.spec @@ -21,7 +21,7 @@ %{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d} Name: matomo -Version: 4.16.0 +Version: 5.0.0 Release: 0 Summary: Web analytics platform License: GPL-3.0-or-later @@ -123,7 +123,7 @@ do sed -i "/\W\"${i}\"\W/d" config/manifest.inc.php done # Insert new hashes for chanded files -for file in console 'vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php' 'config/global.ini.php' 'core/CliMulti/Output.php' 'plugins/CoreUpdater/Commands/Update.php' 'vendor/matomo/matomo-php-tracker/run_tests.sh' 'vendor/wikimedia/less.php/bin/lessc' 'misc/log-analytics/import_logs.py' 'core/CliMulti.php' +for file in console 'vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php' 'config/global.ini.php' 'core/CliMulti/Output.php' 'plugins/CoreUpdater/Commands/Update.php' 'vendor/matomo/matomo-php-tracker/run_tests.sh' 'vendor/wikimedia/less.php/bin/lessc' 'misc/log-analytics/import_logs.py' 'core/CliMulti.php' 'vendor/symfony/error-handler/Resources/bin/extract-tentative-return-types.php' 'vendor/symfony/error-handler/Resources/bin/patch-type-declarations' 'vendor/symfony/var-dumper/Resources/bin/var-dump-server' do size=$(ls -l $file | awk '{ print $5 }') checksum=$(md5sum $file | awk '{ print $1 }') From 8076dfc5f46155951cebe25cc1cac6ec06305b784b50be839e8e51ec08b71c67 Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Tue, 19 Dec 2023 12:18:39 +0000 Subject: [PATCH 2/2] Accepting request 1134023 from home:ecsos:server Update to 5.0.0 OBS-URL: https://build.opensuse.org/request/show/1134023 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=123 --- How to install Matomo.html | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 How to install Matomo.html diff --git a/How to install Matomo.html b/How to install Matomo.html deleted file mode 100644 index 86f0d49..0000000 --- a/How to install Matomo.html +++ /dev/null @@ -1,8 +0,0 @@ - - - - - -You will be redirected to the Matomo Analytics Installation documentation on matomo.org/docs/installation - -