Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=302702fb34f716f7465086fba7f4e8604e6797ef
commit 302702fb34f716f7465086fba7f4e8604e6797ef Author: Devil505 <[email protected]> Date: Wed Oct 26 10:40:13 2011 +0200 rpm-5.2.1-4-i686 * resolving conflict with xar * closed #4295 diff --git a/source/apps-extra/rpm/FrugalBuild b/source/apps-extra/rpm/FrugalBuild index 1080239..1621913 100644 --- a/source/apps-extra/rpm/FrugalBuild +++ b/source/apps-extra/rpm/FrugalBuild @@ -4,7 +4,7 @@ pkgname=rpm pkgver=5.2.1 -pkgrel=3 +pkgrel=4 pkgdesc="Red Hat Package Manager" url="http://rpm5.org"; depends=('pcre' 'sqlite3' 'popt' 'beecrypt>=4.2.1-1' 'openssl>=1.0.0' 'xz>=5.0.3' \ @@ -42,6 +42,11 @@ build(){ r $Flocalstatedir/lib/rpm/__db.* d $Flocalstatedir/lock/rpm 0755 root root - EOF + + # resolving conflict with xar package + Frm /usr/bin/xar + Frm /usr/include/xar/xar.h + Frm /usr/share/man/man1/xar.1.gz } # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
