forked from pool/matomo
Accepting request 850578 from home:ecsos:server
- Update to 4.0.0 Too many changes to list here. See instead: https://github.com/matomo-org/matomo/releases/tag/4.0.0 - Fix boo#1162178: Add matomo-package_update.patch to not show warning message when auto_update_enable es disable through package installation. OBS-URL: https://build.opensuse.org/request/show/850578 OBS-URL: https://build.opensuse.org/package/show/network:utilities/matomo?expand=0&rev=81
This commit is contained in:
Git OBS Bridge
parent
7896006a87
commit
8e1d0fbe23
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:63a3a36ee15893665232c24e2918786dffa8f73fe7026807381f8570d2d9e63e
|
||||
size 16134429
|
||||
3
matomo-4.0.0.tar.gz
Normal file
3
matomo-4.0.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9db8a6c05db425319499bd34ba396e1669b5325e4c3415b0db63714bbe76cfa2
|
||||
size 14787629
|
||||
@ -59,3 +59,7 @@ For cron you must uncomment the line in /etc/cron.d/matomo-archive
|
||||
For systemd.timer you must start and enable matomo-archive.timer:
|
||||
~# /usr/bin/systemctl enable --now matomo-archive.timer
|
||||
|
||||
g) Enable infile
|
||||
- GRANT FILE ON *.* TO '<your_matomo_user>'@'localhost'
|
||||
- usermod -a -G www mysql
|
||||
- systemctl restart mysql apache2
|
||||
|
||||
15
matomo-package_update.patch
Normal file
15
matomo-package_update.patch
Normal file
@ -0,0 +1,15 @@
|
||||
diff -Pdpru matomo.orig/plugins/CoreUpdater/Commands/Update.php matomo/plugins/CoreUpdater/Commands/Update.php
|
||||
--- matomo.orig/plugins/CoreUpdater/Commands/Update.php 2020-11-23 20:20:18.000000000 +0100
|
||||
+++ matomo/plugins/CoreUpdater/Commands/Update.php 2020-11-24 14:16:58.087597130 +0100
|
||||
@@ -70,7 +70,11 @@ class Update extends ConsoleCommand
|
||||
$this->writeSuccessMessage($output, 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);
|
||||
+ }
|
||||
|
||||
|
||||
} catch(NoUpdatesFoundException $e) {
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 24 11:58:12 UTC 2020 - ecsos <ecsos@opensuse.org>
|
||||
|
||||
- Update to 4.0.0
|
||||
Too many changes to list here. See instead:
|
||||
https://github.com/matomo-org/matomo/releases/tag/4.0.0
|
||||
|
||||
- Fix boo#1162178:
|
||||
Add matomo-package_update.patch to not show warning message when
|
||||
auto_update_enable es disable through package installation.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 5 05:56:59 UTC 2020 - ecsos <ecsos@opensuse.org>
|
||||
|
||||
|
||||
15
matomo.spec
15
matomo.spec
@ -32,7 +32,7 @@
|
||||
%{!?_tmpfilesdir:%global _tmpfilesdir %{_prefix}/lib/tmpfiles.d}
|
||||
|
||||
Name: matomo
|
||||
Version: 3.14.1
|
||||
Version: 4.0.0
|
||||
Release: 0
|
||||
Summary: Web analytics platform
|
||||
License: GPL-3.0-or-later
|
||||
@ -48,6 +48,8 @@ Source12: %{name}-archive.timer
|
||||
Source13: %{name}.my.cnf
|
||||
Source14: %{name}-tmpfile.conf
|
||||
Source99: %{name}.rpmlintrc
|
||||
# PATCH-FIX-OPENSUSE: Don't show wrong message with wrong owner of %%{ap_serverroot}/%%{name} when disable enable_auto_update through package installation.
|
||||
Patch1: %{name}-package_update.patch
|
||||
BuildArch: noarch
|
||||
%if 0%{?suse_version} >= 1500
|
||||
Requires(pre): user(%ap_usr)
|
||||
@ -63,8 +65,10 @@ BuildRequires: mariadb
|
||||
BuildRequires: unzip
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
Requires: apache2
|
||||
Requires: nodejs
|
||||
Requires: python3
|
||||
Requires: logrotate
|
||||
Requires: mod_php_any >= 5.5.9
|
||||
Requires: mod_php_any >= 7.2.5
|
||||
Requires: php-ctype
|
||||
Requires: php-curl
|
||||
Requires: php-dom
|
||||
@ -97,6 +101,7 @@ strategy and online experience of visitors may be optimized.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}
|
||||
%patch1 -p1
|
||||
install -m644 %{SOURCE4} README.SUSE
|
||||
# remove unwanted files
|
||||
find . -type f "(" -name .htaccess -o -name .travis.sh -o -name .gitkeep ")" -delete
|
||||
@ -104,6 +109,7 @@ find . -type f "(" -name .htaccess -o -name .travis.sh -o -name .gitkeep ")" -de
|
||||
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' {} +
|
||||
find . -type f -name "*.sh" -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} +
|
||||
|
||||
#
|
||||
# disable the auto updater, it can't work properly with the new, more secure permissions and is a bad idea on a RPM based setup anyways.
|
||||
@ -118,7 +124,7 @@ 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' 'config/global.ini.php' 'core/CliMulti/Output.php'
|
||||
for file in console 'vendor/leafo/lessphp/plessc' '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'
|
||||
do
|
||||
size=$(ls -l $file | awk '{ print $5 }')
|
||||
checksum=$(md5sum $file | awk '{ print $1 }')
|
||||
@ -228,7 +234,7 @@ fi
|
||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/log-analytics/import_logs.py
|
||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/composer/clean-xhprof.sh
|
||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/misc/composer/build-xhprof.sh
|
||||
#%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/plugins/TestRunner/scripts/on_instance_launch.sh
|
||||
#%%attr(0770,%%{ap_usr},%%{ap_grp}) %%{ap_serverroot}/%%{name}/plugins/TestRunner/scripts/on_instance_launch.sh
|
||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/package.sh
|
||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/lessify
|
||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/leafo/lessphp/plessc
|
||||
@ -236,6 +242,7 @@ fi
|
||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/szymach/c-pchart/coverage.sh
|
||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/tecnickcom/tcpdf/tools/tcpdf_addfont.php
|
||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/twig/twig/drupal_test.sh
|
||||
%attr(0770,%{ap_usr},%{ap_grp}) %{ap_serverroot}/%{name}/vendor/matomo/matomo-php-tracker/run_tests.sh
|
||||
%{ap_serverroot}/%{name}/*
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
Reference in New Issue
Block a user