Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=ee9a20fac75c616b7aa8bfa7b66615510e15c354
commit ee9a20fac75c616b7aa8bfa7b66615510e15c354 Author: Miklos Vajna <vmik...@frugalware.org> Date: Fri Mar 18 12:46:41 2011 +0100 bitlbee-3.0.2-1-i686 - bump USE_DEVEL to test upstream systemd patch diff --git a/source/include/scm.sh b/source/include/scm.sh index 280e765..ff2fd8f 100644 --- a/source/include/scm.sh +++ b/source/include/scm.sh @@ -95,7 +95,9 @@ elif [ "$_F_scm_type" == "mercurial" ]; then up2date="date +%Y%m%d%H%M%S --date '`lynx -dump $_F_scm_url/?style=rss|grep pubDate|sed 's/.*>\(.*\)<.*/\1/;q'`'" makedepends=(${makedepends[@]} 'mercurial') elif [ "$_F_scm_type" == "bzr" ]; then - up2date="echo -n ${pkgver%%.bzr*}.bzr;bzr revno $_F_scm_url" + # last version is 1.0, last rev is 577, then it should be + # 1.0.577 (so pacman-g2 will see the version is > 1.0 and < 1.1) + up2date="echo -n ${pkgver%.*}.;bzr revno $_F_scm_url" makedepends=(${makedepends[@]} 'bzr') fi diff --git a/source/network-extra/bitlbee/FrugalBuild b/source/network-extra/bitlbee/FrugalBuild index ebe57f7..ab200e2 100644 --- a/source/network-extra/bitlbee/FrugalBuild +++ b/source/network-extra/bitlbee/FrugalBuild @@ -1,11 +1,11 @@ # Compiling Time: ~0.22 SBU # Maintainer: voroskoi <voros...@frugalware.org> -USE_DEVEL=${USE_DEVEL:-"n"} +USE_DEVEL=${USE_DEVEL:-"y"} pkgname=bitlbee pkgver=3.0.2 -Fuse $USE_DEVEL && pkgver=1.3dev.bzr635 +Fuse $USE_DEVEL && pkgver=3.0.2.771 pkgrel=1 pkgdesc="An IRC to other chat networks gateway." url="http://www.bitlbee.org/main.php/news.html" @@ -43,6 +43,8 @@ build() { Fpatchall Fmake --etcdir=/etc --otr=plugin Fmkdir /var/lib/bitlbee + # fakeroot does not set $USER, check for uid instead + Fsed 'ifeq ($(USER),root)' 'ifeq ($(shell id -u),0)' Makefile make DESTDIR=$Fdestdir install-etc install-dev || Fdie Fmakeinstall chown 503:503 $Fdestdir/var/lib/bitlbee || return 1 _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git