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

Move commands which no longer require perl into git-core

Browse Source 
Commands which required perl were moved from git-core to git in 6fdc5e5
(new subpackage git-core, which is perl-less and part of original git
rpm, 2015-06-03).  This was with git-2.4.2.  Since then, a number of
commands have been partially or entirely rewritten upstream and no
longer require perl.  Move them back to git-core.

- git-am was converted to a builtin in 2.6.0, 783d7e865e (builtin-am:
  remove redirection to git-am.sh, 2015-08-04)

- git-submodule's dependence on perl was removed in 2.10.0, 74703a1e4d
  (submodule: rewrite `module_list` shell function in C, 2015-09-02)

- git-relink was removed in 2.12.0, ed21e30fef (relink: retire the
  command, 2017-01-25)

Additionally, two sample hooks (pre-rebase and prepare-commit-msg) were
intended to be excluded from git-core due to their perl dependencies,
but were included due to the way the exclusion via %files lists are
created.  List them explicitly in the git %files section and exclude
them from git-core.
This commit is contained in:
Todd Zullinger 2017-11-10 20:40:48 -05:00
parent 054dd6179a
commit cb7fab7e6c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git.spec
View File

@ -531,7 +531,7 @@ chmod a-x Documentation/technical/api-index.sh
find contrib -type f | xargs chmod -x
# Split core files
not_core_re="git-(add--interactive|am|credential-(gnome-keyring|libsecret|netrc)|difftool|instaweb|relink|request-pull|send-mail|submodule)|gitweb|prepare-commit-msg|pre-rebase"
not_core_re="git-(add--interactive|credential-(gnome-keyring|libsecret|netrc)|difftool|instaweb|request-pull|send-mail)|gitweb"
grep -vE "$not_core_re|%{_mandir}" bin-man-doc-files > bin-files-core
grep -vE "$not_core_re" bin-man-doc-files | grep "%{_mandir}" > man-doc-files-core
grep -E "$not_core_re" bin-man-doc-files \
@ -598,6 +598,8 @@ rm -rf %{buildroot}
%endif
%{_datadir}/git-core/contrib/hooks/update-paranoid
%{_datadir}/git-core/contrib/hooks/setgitperms.perl
%{_datadir}/git-core/templates/hooks/pre-rebase.sample
%{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample
%files core -f bin-files-core
%defattr(-,root,root)
@ -605,9 +607,11 @@ rm -rf %{buildroot}
# be used elsewhere
%{!?_licensedir:%global license %doc}
%license COPYING
# exlude is best way here because of troubels with symlinks inside git-core/
# exlude is best way here because of troubles with symlinks inside git-core/
%exclude %{_datadir}/git-core/contrib/hooks/update-paranoid
%exclude %{_datadir}/git-core/contrib/hooks/setgitperms.perl
%exclude %{_datadir}/git-core/templates/hooks/pre-rebase.sample
%exclude %{_datadir}/git-core/templates/hooks/prepare-commit-msg.sample
%{bashcomproot}
%{_datadir}/git-core/
@ -733,6 +737,7 @@ rm -rf %{buildroot}
- Fix shebang in a few places to silence rpmlint complaints
- Fix t9020-remote-svn failure when setting PYTHON_PATH
- Rename %%gitcoredir to %%gitexecdir; upstream uses the latter
- Move commands which no longer require perl into git-core
* Mon Oct 30 2017 Todd Zullinger <tmz@pobox.com> - 2.15.0-1
- Update to 2.15.0