Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=fc10ff80ba74242f41f6ee1c91571d10dcefe919
commit fc10ff80ba74242f41f6ee1c91571d10dcefe919 Author: James Buren <r...@frugalware.org> Date: Wed Dec 15 13:28:50 2010 -0600 openmotif-2.3.3-3-i686 * really fix the conflict diff --git a/source/xlib/openmotif/FrugalBuild b/source/xlib/openmotif/FrugalBuild index fb2ddf3..a530bfb 100644 --- a/source/xlib/openmotif/FrugalBuild +++ b/source/xlib/openmotif/FrugalBuild @@ -3,7 +3,7 @@ pkgname=openmotif pkgver=2.3.3 -pkgrel=2 +pkgrel=3 pkgdesc="Open Motif" url="http://openmotif.com"; depends=('glibc' 'libice>=1.0.5' 'libxp>=1.0.0-3' 'libxmu>=1.0.4-2' 'libsm>=1.1.0' 'libxaw>=1.0.5' 'libxft>=2.1.13-2') @@ -20,7 +20,7 @@ build() Fbuild --with-x # conflicts with perl Frm /usr/man/man3/Shell.3 - Frm /usr/share/man/man3/Shell.3.gz + Frm /usr/share/man/man3/Shell.3 # conflicts with util-linux Frm /usr/bin/column # conflicts with tree _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
