Changes - SailfishOS Open Build Service

Changes of Revision 15

[-] [+]	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+master.20220522131215.5.g77733f0 +Version: 5.9+master.20220522202451.6.gf514210 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/%{version}/functions/$f + chmod +x $RPM_BUILD_ROOT%{_datadir}/zsh/%{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 ^
@@ -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">77733f041ffa67aa52d2823c73abf56e0f0a9e44</param> + <param name="revision">f514210ea34eb7662e50571079bad0ebe1998f54</param> <param name="token"/> <param name="debian">N</param> <param name="dumb">N</param>
	Deleted	_service:tar_git:zsh-5.9+master.20220522131215.5.g77733f0.tar.bz2 ^
	Added	_service:tar_git:zsh-5.9+master.20220522202451.6.gf514210.tar.bz2 ^