From 3e204c057b593fe8e63c822589b8d23c8c574f87 Mon Sep 17 00:00:00 2001 From: zhuchunyi Date: Wed, 6 Nov 2019 19:08:14 +0800 Subject: [PATCH] update code --- git.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/git.spec b/git.spec index e6c8be1..d9c07f6 100644 --- a/git.spec +++ b/git.spec @@ -1,7 +1,7 @@ %global gitexecdir %{_libexecdir}/git-core Name: git Version: 2.23.0 -Release: 4 +Release: 5 Summary: A popular and widely used Version Control System License: GPLv2+ or LGPLv2.1 URL: https://git-scm.com/ @@ -160,6 +160,14 @@ install -p -m 644 README.md %{buildroot}%{_pkgdocdir} install -p -m 644 gitweb/INSTALL %{buildroot}%{_pkgdocdir}/INSTALL.gitweb install -p -m 644 gitweb/README %{buildroot}%{_pkgdocdir}/README.gitweb +# install contrib to git-core +mkdir -p %{buildroot}%{_datadir}/git-core/contrib/completion +mv contrib/hooks/multimail/git_multimail{.py,} +mv contrib/hooks %{buildroot}%{_datadir}/git-core/contrib +install -p -m 644 contrib/completion/git-completion.tcsh %{buildroot}%{_datadir}/git-core/contrib/completion/ +install -p -m 644 contrib/completion/git-prompt.sh %{buildroot}%{_datadir}/git-core/contrib/completion/ +install -D -p -m 0755 contrib/diff-highlight/diff-highlight %{buildroot}%{_datadir}/git-core/contrib/diff-highlight + # install root path for gitweb mkdir -p %{buildroot}%{_localstatedir}/lib/git @@ -198,6 +206,7 @@ make test %files -f git-bin-files %defattr(-,root,root) +%{_datadir}/git-core/ %doc README.md %license LGPL-2.1 COPYING @@ -253,10 +262,11 @@ make test %{_mandir}/man3/Git.* %{_mandir}/man5/git*.5.* %{_mandir}/man7/git*.7.* -#templates for users -%{_datadir}/git-core/ %changelog +* Thu Oct 31 2019 openEuler Buildteam - 2.23.0-5 +- Modify installation of contrib and templates + * Wed Sep 25 2019 openEuler Buildteam - 2.23.0-4 - Modify license