From 9125e652738865e75f2bddbcc698053eb1e67bf9 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Wed, 30 May 2018 19:12:16 -0400 Subject: [PATCH] Use new INSTALL_SYMLINKS setting Replace NO_CROSS_DIRECTORY_HARDLINKS and NO_INSTALL_HARDLINKS with INSTALL_SYMLINKS. The result is slightly improved; all symlinks will point directly to the target rather than via multiple levels of symlinks. The rationale was covered in slightly more detail in d56cfc6 ("Use symlinks instead of hardlinks for installed binaries", 2018-03-15). Adjust the dangling-relative-symlink filter in the rpmlint config for the new target of the git-difftool symlink. --- git.rpmlintrc | 2 +- git.spec | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/git.rpmlintrc b/git.rpmlintrc index 9a57745..221ca04 100644 --- a/git.rpmlintrc +++ b/git.rpmlintrc @@ -8,7 +8,7 @@ addFilter("git-subtree.* spelling-error %description .* (subdirectory|subproject addFilter("git(-core-doc)?\..*: W: dangling-relative-symlink /usr/share/doc/git/contrib/hooks ../../../git-core/contrib/hooks") # git requires git-core, which provides the symlink target -addFilter("git\..*: W: dangling-relative-symlink /usr/libexec/git-core/git-difftool git") +addFilter("git\..*: W: dangling-relative-symlink /usr/libexec/git-core/git-difftool ../../bin/git") # git-gui requires git, which provides the git binary addFilter("git-gui.noarch: W: desktopfile-without-binary /usr/share/applications/git-gui.desktop git") diff --git a/git.spec b/git.spec index 5c4cdc3..9575a0d 100644 --- a/git.spec +++ b/git.spec @@ -448,10 +448,9 @@ LDFLAGS = %{__global_ldflags} NEEDS_CRYPTO_WITH_SSL = 1 USE_LIBPCRE = 1 ETC_GITCONFIG = %{_sysconfdir}/gitconfig +INSTALL_SYMLINKS = 1 GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GNU_ROFF = 1 -NO_CROSS_DIRECTORY_HARDLINKS = 1 -NO_INSTALL_HARDLINKS = 1 NO_PERL_CPAN_FALLBACKS = 1 %if %{with python2} PYTHON_PATH = %{__python2} @@ -529,11 +528,6 @@ sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \ %install %make_install %{?with_docs:install-doc} -# symlink %%{gitexecdir} copies of git, git-shell, and git-upload-pack -for i in git git-shell git-upload-pack; do - ln -sf ../../bin/$i %{buildroot}%{gitexecdir}/$i -done - %global elispdir %{_emacs_sitelispdir}/git pushd contrib/emacs >/dev/null for el in *.el ; do @@ -879,6 +873,7 @@ make test || ./print-failed-test-output %changelog * Wed May 30 2018 Todd Zullinger - 2.18.0-0.0.rc0 - Update to 2.18.0-rc0 +- Use new INSTALL_SYMLINKS setting * Wed May 30 2018 Todd Zullinger - 2.17.1-3 - Use %%apply_patch for aarch64 zlib patch, return to %%autosetup