Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4fdc23061bc55354d3428b9241e78da1c224d160
commit 4fdc23061bc55354d3428b9241e78da1c224d160 Author: Miklos Vajna <[email protected]> Date: Thu Dec 31 15:01:24 2015 +0100 git-2.6.4-1-x86_64 - 2.6.3 -> 2.6.4 - drop makedepend on now removed texlive-fonts-extra diff --git a/source/devel-extra/git/FrugalBuild b/source/devel-extra/git/FrugalBuild index c57e7b8..f024ecb 100644 --- a/source/devel-extra/git/FrugalBuild +++ b/source/devel-extra/git/FrugalBuild @@ -7,8 +7,8 @@ USE_HTMLMAN=${USE_HTMLMAN:-"y"} pkgname=git -pkgver=2.6.3 -pkgrel=2 +pkgver=2.6.4 +pkgrel=1 pkgdesc="A fast, scalable, distributed revision control system." _F_archive_grepv="rc" url="http://git-scm.com/"; @@ -16,17 +16,13 @@ source=(https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz) up2date="Flasttar https://www.kernel.org/pub/software/scm/git/"; depends=('curl>=7.19.0' 'expat' 'perl-error' 'openssl>=1.0.1') backup=(etc/sysconfig/git) -if [ "$CARCH" = "arm" ]; then - makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'docbook2x>=0.8.3-3' 'sgml-common' 'xmlto') -else - makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'docbook2x>=0.8.3-3' 'sgml-common' 'xmlto' 'dblatex>=0.3-3' 'texlive-fonts-extra>=20120701-3') -fi +makedepends=('asciidoc' 'docbook-xsl>=1.73.0-2' 'docbook-xml' 'docbook2x>=0.8.3-3' 'sgml-common' 'xmlto') groups=('devel-extra') replaces=('cogito' 'bk-client') archs=('i686' 'x86_64' 'arm') source=(${source[@]} gitweb.modules.d gitweb.conf README.Frugalware \ $pkgname.service $pkgname.sysconfig) -sha1sums=('eb522811e095c8c972ab5724ab8e964cc13ebc0f' \ +sha1sums=('aa38f1a026add0d840049abd0040ad2938c113e8' \ 'c60be6e086241b85b1f0d89db22c24fc21dc6432' \ '58698ef6cf0dad734e1a1ee5689c0c4d83bf27b5' \ '92b64c9b49242935ca6ae35b3a9cad728a0c2d55' \ @@ -63,13 +59,8 @@ build() build_settings="V=1 ETC_GITCONFIG=/etc/gitconfig htmldir=/usr/share/doc/$pkgname-$pkgver \ mandir=/usr/share/man pdfdir=/usr/share/doc/$pkgname-$pkgver \ ASCIIDOC_NO_ROFF=YesPlease" - if [ "$CARCH" = "arm" ]; then - make -j1 $build_settings all doc info || return 1 - Fmakeinstall $build_settings install-doc install-info - else - make -j1 $build_settings all doc info pdf || return 1 - Fmakeinstall $build_settings install-doc install-info install-pdf - fi + make -j1 $build_settings all doc info || return 1 + Fmakeinstall $build_settings install-doc install-info make -C Documentation WEBDOC_DEST=$Fdestdir/usr/share/doc/$pkgname-$pkgver install-webdoc || return 1 # broken symlink Frm /usr/share/doc/git-$pkgver/index.html _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
