* Fri Sep 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.0.1-2.sme

- apply pull request to fix PHP Warning
  https://github.com/corbosman/message_highlight/pull/27
This commit is contained in:
Jean-Philippe Pialasse 2024-09-13 11:40:12 -04:00
parent 7bc4defd13
commit 7156f0b09c
2 changed files with 21 additions and 5 deletions

12
pr27.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Nur message_highlight-1.0.1.ori/message_highlight.php message_highlight-1.0.1/message_highlight.php
--- message_highlight-1.0.1.ori/message_highlight.php 2020-07-16 01:56:38.000000000 -0400
+++ message_highlight-1.0.1/message_highlight.php 2024-09-13 11:27:15.693000000 -0400
@@ -49,7 +49,7 @@
*/
function storage_init($p)
{
- $p['fetch_headers'] .= trim($p['fetch_headers']. ' ' . 'CC');
+ $p['fetch_headers'] = trim(($p['fetch_headers'] ?? '') . ' ' . 'CC');
return($p);
}

View File

@ -1,12 +1,13 @@
%define name roundcube-plugin-message_highlight %define name roundcube-plugin-message_highlight
%define version 1.0.1 %define version 1.0.1
%define release 1 %define release 2
Summary: Provides context Menu to Roundcube. Summary: Provides context Menu to Roundcube.
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
Release: %{release}%{?dist} Release: %{release}%{?dist}
#https://github.com/corbosman/message_highlight #https://github.com/corbosman/message_highlight and https://github.com/texxasrulez/message_highlight
Source: roundcube-message_highlight-%{version}.tar.gz Source: roundcube-message_highlight-%{version}.tar.gz
Patch0: pr27.patch
License: GNU General Public License Version 3+ License: GNU General Public License Version 3+
Group: SMEserver/addon Group: SMEserver/addon
BuildRoot: %{_tmppath}/%{name}-buildroot BuildRoot: %{_tmppath}/%{name}-buildroot
@ -25,15 +26,21 @@ folder manipulation and message filters.
With this plugin you can colorize the message index rows based on specific criteria like sender, recipient and subject. With this plugin you can colorize the message index rows based on specific criteria like sender, recipient and subject.
%changelog %changelog
* Fri Sep 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.0.1-2.sme
- apply pull request to fix PHP Warning
https://github.com/corbosman/message_highlight/pull/27
* Wed Sep 11 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.0.1-1.sme * Wed Sep 11 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.0.1-1.sme
- initial release for SME 11 - initial release for SME 11
%prep %prep
%setup -q -n message_highlight-%{version} %setup -q -n message_highlight-%{version}
%patch0 -p1
%build %build
#perl createlinks #perl createlinks
#pr 27
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -42,9 +49,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/roundcubemail/plugins/message_highlight/
rm -f %{name}-%{version}-filelist rm -f %{name}-%{version}-filelist
/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
> %{name}-%{version}-filelist > %{name}-%{version}-filelist
#echo "%doc COPYING" >> %{name}-%{version}-filelist
#--dir <dir> 'attr(755,user,grp)' \
#--file <file> 'attr(755,root,root)' \
%clean %clean
cd .. cd ..