diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 80dd60649a5..9be697a3418 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,7 +1,7 @@ # Template file for 'git' pkgname=git -version=2.20.1 -revision=2 +version=2.21.0 +revision=1 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2 ac_cv_snprintf_returns_bogus=no" @@ -18,7 +18,7 @@ license="GPL-2.0-only" homepage="https://git-scm.com/" changelog="https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/${version}.txt" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" -checksum=9d2e91e2faa2ea61ba0a70201d023b36f54d846314591a002c610ea2ab81c3e9 +checksum=8ccb1ce743ee991d91697e163c47c11be4bf81efbdd9fb0b4a7ad77cc0020d28 replaces="git-perl>=0" subpackages="git-cvs git-svn gitk git-gui git-all git-libsecret" @@ -33,6 +33,7 @@ post_build() { make ${makejobs} -C contrib/subtree all git-subtree.1 make ${makejobs} -C contrib/credential/libsecret } + post_install() { make NO_INSTALL_HARDLINKS=1 DESTDIR=${DESTDIR} install-doc vinstall contrib/completion/git-completion.bash 644 \ @@ -56,6 +57,7 @@ git-cvs_package() { vmove usr/share/man/man1/git-cvsserver.1 } } + git-svn_package() { depends="${sourcepkg}-${version}_${revision} subversion-perl perl-Term-ReadKey" short_desc+=" - Subversion support" @@ -66,16 +68,18 @@ git-svn_package() { vmove usr/share/man/man1/git-svn.1 } } + gitk_package() { archs=noarch depends="git-${version}_${revision} tk" - short_desc="The Git repository browser" + short_desc="Git repository browser" pkg_install() { vmove usr/bin/gitk vmove usr/share/gitk vmove usr/share/man/man1/gitk.1 } } + git-gui_package() { archs=noarch depends="git-${version}_${revision} tk" @@ -87,12 +91,14 @@ git-gui_package() { vmove usr/share/git-gui } } + git-all_package() { build_style=meta archs=noarch depends="${subpackages/git-all/}" short_desc+=" - meta-package for complete Git installation" } + git-libsecret_package() { depends="git-${version}_${revision}" short_desc+=" - libsecret credential helper"