Changes - SailfishOS Open Build Service

Changes of Revision 6

[-] [+]	Changed	_service:tar_git:zsh.spec
@@ -2,7 +2,7 @@ Summary: The Z shell # define own version because sometimes OBS fiddles with %%{version} %define upstream_version 5.9 -Version: 5.9 +Version: 5.9+master.20220522204759.7.gca64199 Release: 1 Group: Applications/System License: MIT @@ -64,7 +64,7 @@ %configure \ --with-tcsetpgrp \ --enable-pcre \ - --enable-site-fndir=/usr/local/share/zsh/site-functions \ + --enable-site-fndir=%{_datadir}/zsh/site-functions \ --enable-ldflags="-g -Wl,-z,relro,-z,now -Wl,--as-needed" # TODO doc fails to build because of missing dependency groff @@ -87,12 +87,18 @@ make DESTDIR=%{buildroot} install.modules make DESTDIR=%{buildroot} install.fns +# avoid invalid Requires to be generated +for f in test-repo-git-rebase-{apply,merge}; do + sed -i -e 's!/usr/local/bin/zsh!%{_bindir}/zsh!' $RPM_BUILD_ROOT%{_datadir}/zsh/%{upstream_version}/functions/$f + chmod +x $RPM_BUILD_ROOT%{_datadir}/zsh/%{upstream_version}/functions/$f +done + %files %defattr(-,root,root,-) %{_bindir}/%{name} /bin/%{name} %{_libdir}/%{name}/ -%{_datadir}/%{name}/%{upstream_version}/* +%{_datadir}/%{name} %post if [ "$1" -eq 1 ]; then
[-] [+]	Changed	_service:tar_git:001-disable-failing-tests.patch ^
@@ -1,3 +1,41 @@ +--- a/Test/A05execution.ztst ++++ b/Test/A05execution.ztst +@@ -342,35 +342,6 @@ F:anonymous function, and a descriptor leak when backgrounding a pipeline + >17 + >19 + +-# Test 'wait' for unknown job/process ID. +- wait 1 +- echo $? +- wait %% +- echo $? +- wait %+ +- echo $? +- wait %- +- echo $? +- wait %1 +- echo $? +- wait %foo +- echo $? +- wait %\?bar +-127:'wait' exit status and warning for unknown ID +->127 +->127 +->127 +->127 +->127 +->127 +-?(eval):wait:1: pid 1 is not a child of this shell +-?(eval):wait:3: %%: no such job +-?(eval):wait:5: %+: no such job +-?(eval):wait:7: %-: no such job +-?(eval):wait:9: %1: no such job +-?(eval):wait:11: job not found: foo +-?(eval):wait:13: job not found: ?bar +- + # Test 'wait' for unknown job/process ID (POSIX mode). + (setopt POSIX_BUILTINS + wait 1 --- a/Test/B13whence.ztst +++ b/Test/B13whence.ztst @@ -15,9 +15,15 @@ @@ -175,4 +213,14 @@ + ZTST_skip=${SFDK_SKIP_SOME_TESTS} 0:zsystem flock successful wait test, fractional seconds ?elapsed time seems OK - F:This timing test might fail due to process scheduling issues unrelated to zsh. \ No newline at end of file + F:This timing test might fail due to process scheduling issues unrelated to zsh. +--- a/Test/W02jobs.ztst ++++ b/Test/W02jobs.ztst +@@ -183,6 +183,7 @@ + zpty_input 'kill -KILL %1' + zpty_line + zpty_stop ++ ZTST_skip="Test fails in 5% of all runs" + 0:various `kill` signals with multiple running jobs + >\[1] [0-9]## + >\[2] [0-9]## \ No newline at end of file
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/sailfishos-chum/zsh-packaging.git</param> <param name="branch">master</param> - <param name="revision">v5.9-1</param> + <param name="revision">ca64199beb725588248b78a5fadf208deae0439a</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
	Added	_service:tar_git:zsh-5.9+master.20220522204759.7.gca64199.tar.bz2 ^
	Deleted	_service:tar_git:zsh-5.9.tar.bz2 ^