Thank you for your reply, Russell. I tried the following commands. ----- $git clone http://corosync.org/git/corosync.git build $cd build $git checkout -b flatiron origin/flatiron $git branch * flatiron master ----- I acquired a file by an above command. And there seems to be the cause that caused the error when I watch an corosync.spec.in file.
Regards, Tomo 2011/2/8 Russell Bryant <[email protected]> > On Mon, Feb 7, 2011 at 8:21 PM, nozawat <[email protected]> wrote: > > Hi > > > > As for latest flatiron, corosync.spec.in seems to be funny. > > Build was possible without a problem before. > > The following errors occur. > > ---- > > rpmbuild --define "_sourcedir /usr/src/redhat/SOURCES" --define "_specdir > > /usr/src/redhat/SPECS" --define "_builddir /usr/src/redhat/BUILD" > --define > > "_srcrpmdir /usr/src/redhat/SRPMS" --define "_rpmdir > /usr/src/redhat/RPMS" > > -ba corosync.spec > > error: line 5: Unknown tag: <<<<<<< HEAD > > make: *** [rpm] Error 1 > > --- > > It looks like you may have had some local changes that conflicted with > an upstream change. I don't see those conflict markers in the > flatiron branch. > > -- > Russell Bryant > _______________________________________________ > Openais mailing list > [email protected] > https://lists.linux-foundation.org/mailman/listinfo/openais >
corosync.spec.in
Description: Binary data
_______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
