On Thu, 23 Mar 2006 19:38:26 +0100 (CET), Paul Wouters wrote: > On Thu, 23 Mar 2006, Paul Wouters wrote: > > > I am running into a strange problem where the l2tpd package keeps using the > > "fc5" instead of "fc6" in the devel directory. I tried 'cvs -q upd -d' > > and make build. I tried bumping the release, commiting the spec file and > > 'make tag', but that still picks fc5. I even tried to manually specify > > "cvs tag -c l2tpd-0_69-0_5_20051030_fc6", and even though that works fine > > in creating the tag, 'make build' still picks the "fc5" tag. > > > > does anyone know how to fix this? Work in a clean checkout of l2tpd, a clean working directory. Don't cvs-import.sh complete src.rpms back and forth between multiple branches in CVS. Update your "common" directory, too. Make sure your package in the FC-5 branch contains a file "branch" which contains "FC-5". When I run cvs co -r l2tpd-0_69-0_4_20051030_fc5 l2tpd cd l2tpd/FC-5 the tagged files don't contain the "branch" directory, so using "make tag" (or "make srpm") with these files will choose the default branch "devel". > To followup on myself, the odd thing is, it did build an "fc6" one: > > The command: > > $ make build > /usr/bin/plague-client build l2tpd l2tpd-0_69-0_4_20051030_fc5 devel > Package l2tpd enqueued. Job ID: 6713. > > shows the "fc5" tag, but email I received from the build system claims: Which is because your tag contains "fc5". > 6713 (l2tpd): Build on target fedora-development-extras succeeded. > Build logs may be found at > http://buildsys.fedoraproject.org/logs/fedora-development-extras/6713-l2tpd-0.69-0.4.20051030.fc6/ > > which shows "fc6" as tag. That's the value %dist gets at build-time, because you submitted the build job for "devel". -- fedora-extras-list mailing list fedora-extras-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-extras-list
