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

fix build --without cvs

Browse Source 
9125e65 ("Use new INSTALL_SYMLINKS setting", 2018-05-30) broke builds
using --without cvs. /usr/libexec/git-core/git-cvsserver became a
symlink instead of hardlink. Adapt the find command used to exclude
'git-cvs*' files to detect symlinks as well.
This commit is contained in:
Pavel Cahyna 2018-06-25 17:24:50 +02:00 committed by Todd Zullinger
parent a66569768e
commit bd7ea152d6
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
git.spec
View File

@ -83,7 +83,7 @@
Name: git Name: git
Version: 2.18.0 Version: 2.18.0
Release: 1%{?rcrev}%{?dist} Release: 2%{?rcrev}%{?dist}
Summary: Fast Version Control System Summary: Fast Version Control System
License: GPLv2 License: GPLv2
URL: https://git-scm.com/ URL: https://git-scm.com/
@ -560,7 +560,7 @@ find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} '
%if ! %{with cvs} %if ! %{with cvs}
# Remove git-cvs* from %%{_bindir} and %%{gitexecdir} # Remove git-cvs* from %%{_bindir} and %%{gitexecdir}
find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name 'git-cvs*' -exec rm -f {} ';' find %{buildroot}{%{_bindir},%{gitexecdir}} \( -type f -o -type l \) -name 'git-cvs*' -exec rm -f {} ';'
%endif %endif
%if ! %{with p4} %if ! %{with p4}
@ -864,6 +864,9 @@ make test || ./print-failed-test-output
%{?with_docs:%{_pkgdocdir}/git-svn.html} %{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog %changelog
* Mon Jun 25 2018 Pavel Cahyna <pcahyna@redhat.com> - 2.18.0-2
- Fix build --without cvs
* Wed Jun 20 2018 Todd Zullinger <tmz@pobox.com> - 2.18.0-1 * Wed Jun 20 2018 Todd Zullinger <tmz@pobox.com> - 2.18.0-1
- Update to 2.18.0 - Update to 2.18.0