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

Use new INSTALL_SYMLINKS setting

Browse Source 
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.
This commit is contained in:
Todd Zullinger 2018-05-30 19:12:16 -04:00
parent d3cc8ccead
commit 9125e65273
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git.rpmlintrc
View File

@ -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") 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 # 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 # git-gui requires git, which provides the git binary
addFilter("git-gui.noarch: W: desktopfile-without-binary /usr/share/applications/git-gui.desktop git") addFilter("git-gui.noarch: W: desktopfile-without-binary /usr/share/applications/git-gui.desktop git")

9
git.spec
View File

@ -448,10 +448,9 @@ LDFLAGS = %{__global_ldflags}
NEEDS_CRYPTO_WITH_SSL = 1 NEEDS_CRYPTO_WITH_SSL = 1
USE_LIBPCRE = 1 USE_LIBPCRE = 1
ETC_GITCONFIG = %{_sysconfdir}/gitconfig ETC_GITCONFIG = %{_sysconfdir}/gitconfig
INSTALL_SYMLINKS = 1
GITWEB_PROJECTROOT = %{_localstatedir}/lib/git GITWEB_PROJECTROOT = %{_localstatedir}/lib/git
GNU_ROFF = 1 GNU_ROFF = 1
NO_CROSS_DIRECTORY_HARDLINKS = 1
NO_INSTALL_HARDLINKS = 1
NO_PERL_CPAN_FALLBACKS = 1 NO_PERL_CPAN_FALLBACKS = 1
%if %{with python2} %if %{with python2}
PYTHON_PATH = %{__python2} PYTHON_PATH = %{__python2}
@ -529,11 +528,6 @@ sed -i -e '1s@#!\( */usr/bin/env python\|%{__python2}\)$@#!%{__python3}@' \
%install %install
%make_install %{?with_docs:install-doc} %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 %global elispdir %{_emacs_sitelispdir}/git
pushd contrib/emacs >/dev/null pushd contrib/emacs >/dev/null
for el in *.el ; do for el in *.el ; do
@ -879,6 +873,7 @@ make test || ./print-failed-test-output
%changelog %changelog
* Wed May 30 2018 Todd Zullinger <tmz@pobox.com> - 2.18.0-0.0.rc0 * Wed May 30 2018 Todd Zullinger <tmz@pobox.com> - 2.18.0-0.0.rc0
- Update to 2.18.0-rc0 - Update to 2.18.0-rc0
- Use new INSTALL_SYMLINKS setting
* Wed May 30 2018 Todd Zullinger <tmz@pobox.com> - 2.17.1-3 * Wed May 30 2018 Todd Zullinger <tmz@pobox.com> - 2.17.1-3
- Use %%apply_patch for aarch64 zlib patch, return to %%autosetup - Use %%apply_patch for aarch64 zlib patch, return to %%autosetup