rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add findutils BuildRequires, improve 'find | xargs' calls

Browse Source 
Ensure find and xargs are required.  While findutils is currently in the
default buildroot, we should still be explicit about the requirement.

Also improve the 'find | xargs' calls to handle files which may contain
spaces, quotes, or other characters which might cause spurious failures.
This commit is contained in:
Todd Zullinger 2018-03-16 21:30:23 -04:00
parent 440594446e
commit 0b3c85937b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git.spec
View File

@ -104,6 +104,7 @@ BuildRequires: linkchecker
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
BuildRequires: emacs BuildRequires: emacs
BuildRequires: expat-devel BuildRequires: expat-devel
BuildRequires: findutils
BuildRequires: gawk BuildRequires: gawk
BuildRequires: gcc BuildRequires: gcc
BuildRequires: gettext BuildRequires: gettext
@ -566,11 +567,11 @@ cat %{name}.lang >> bin-man-doc-files
# quiet some rpmlint complaints # quiet some rpmlint complaints
chmod -R g-w %{buildroot} chmod -R g-w %{buildroot}
find %{buildroot} -name git-mergetool--lib | xargs chmod a-x chmod a-x %{buildroot}%{gitexecdir}/git-mergetool--lib
# These files probably are not needed # These files probably are not needed
find . -regex '.*/\.\(git\(attributes\|ignore\)\|perlcriticrc\)' -delete find . -regex '.*/\.\(git\(attributes\|ignore\)\|perlcriticrc\)' -delete
chmod a-x Documentation/technical/api-index.sh chmod a-x Documentation/technical/api-index.sh
find contrib -type f | xargs chmod -x find contrib -type f -print0 | xargs -r0 chmod -x
# Split core files # Split core files
not_core_re="git-(add--interactive|credential-(libsecret|netrc)|difftool|filter-branch|instaweb|request-pull|send-mail)|gitweb" not_core_re="git-(add--interactive|credential-(libsecret|netrc)|difftool|filter-branch|instaweb|request-pull|send-mail)|gitweb"
@ -612,7 +613,7 @@ find %{buildroot}%{_pkgdocdir}/{howto,technical} -type f \
%check %check
%if %{with docs} && %{test_links} %if %{with docs} && %{test_links}
find %{buildroot}%{_pkgdocdir} -name "*.html" | xargs linkchecker find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker
%endif %endif
# Tests to skip on all releases and architectures # Tests to skip on all releases and architectures
@ -808,6 +809,9 @@ make test || ./print-failed-test-output
%{?with_docs:%{_pkgdocdir}/*svn*.html} %{?with_docs:%{_pkgdocdir}/*svn*.html}
%changelog %changelog
* Fri Mar 16 2018 Todd Zullinger <tmz@pobox.com>
- Add findutils BuildRequires, improve 'find | xargs' calls
* Thu Mar 15 2018 Todd Zullinger <tmz@pobox.com> - 2.17.0-0.0.rc0 * Thu Mar 15 2018 Todd Zullinger <tmz@pobox.com> - 2.17.0-0.0.rc0
- Update to 2.17.0-rc0 - Update to 2.17.0-rc0
- Adjust for simplified perl install - Adjust for simplified perl install