On Fri, 2006-03-03 at 02:33 +0100, Paul Wouters wrote: > On Thu, 2 Mar 2006, Michael Schwendt wrote: > > > > The way it works is: > > > > > > a) patches go in CVS; you 'cvs add <patchfile>', then commit them > > > b) binary sources, like *.tar.gz or *.tar.bz2, go in 'sources', do NOT > > > get added to CVS, and get uploaded with 'make upload FILES=<binary > > > source file>' > > > > Or: make new-sources FILES="file1 file2 file3" > > > > The difference to make upload..." is explained in the Wiki already. > > > > > c) Some sources, like initscripts, that aren't distributed with the > > > upstream tarball, could go into the 'sources' file > > > > As long as they are small text-file (not binaries), they should go > > into CVS. > > So where does my initscript go? cvs or sources? > > I tried it again: > > ]$ make new-source FILES="l2tpd.init l2tpd-0.69.20051030.tar.gz l2tpd.conf" > > Checking : l2tpd.init on https://cvs.fedora.redhat.com/repo/extras/upload.cgi... > Uploading: l2tpd.init to https://cvs.fedora.redhat.com/repo/extras/upload.cgi... > File l2tpd.init size 1126 MD5 ce0b777c5301144bc03d205072a8ea43 stored OK > > Checking : l2tpd-0.69.20051030.tar.gz on https://cvs.fedora.redhat.com/repo/extras/upload.cgi... > This file (36144b856b70d58bdb4ac4805cb71bb2 l2tpd-0.69.20051030.tar.gz) is already uploaded > > Checking : l2tpd.conf on https://cvs.fedora.redhat.com/repo/extras/upload.cgi... > Uploading: l2tpd.conf to https://cvs.fedora.redhat.com/repo/extras/upload.cgi... > File l2tpd.conf size 1025 MD5 fcf5f822027a8f0f855245d366020a66 stored OK > > commited ./sources file. It now looks like: > > $ cat sources > ce0b777c5301144bc03d205072a8ea43 l2tpd.init > 36144b856b70d58bdb4ac4805cb71bb2 l2tpd-0.69.20051030.tar.gz > fcf5f822027a8f0f855245d366020a66 l2tpd.conf > > $ make srpm > rpmbuild --define "_sourcedir /usr/local/fedora-extras/l2tpd/devel" --define "_builddir /usr/local/fedora-extras/l2tpd/devel" --define "_srcrpmdir /usr/local/fedora-extras/l2tpd/devel" --define "_rpmdir /usr/local/fedora-extras/l2tpd/devel" --define "dist .fc5" --define "fedora 5" --nodeps -bs l2tpd.spec > Wrote: /usr/local/fedora-extras/l2tpd/devel/l2tpd-0.69-0.3.20051030.fc5.src.rpm > > But 'make build' still returns: > > Error: could not make srpm for l2tpd-0_69-0_3_20051030_fc5 - output was: > > Downloading l2tpd-MSL2TP-StopCCN.patch... > --20:16:37-- http://cvs.fedora.redhat.com/repo/extras/l2tpd/l2tpd-MSL2TP-StopCCN.patch/6ed1d2dc758627426015de8f87654a03/l2tpd-MSL2TP-StopCCN.patch > => `l2tpd-MSL2TP-StopCCN.patch' > Resolving cvs.fedora.redhat.com... 209.132.176.51 > Connecting to cvs.fedora.redhat.com|209.132.176.51|:80... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2,194 (2.1K) [text/plain] > 0K .. 100% 232.48 MB/s > 20:16:37 (232.48 MB/s) - `l2tpd-MSL2TP-StopCCN.patch' saved [2194/2194] > FINISHED --20:16:37-- > Downloaded: 2,194 bytes in 1 files > -rw-rw-rw- 1 root root 2194 Feb 21 01:32 l2tpd-MSL2TP-StopCCN.patch > rpmbuild --define "_sourcedir /tmp/5761-l2tpd-0_69-0_3_20051030_fc5-1141348593/l2tpd/devel" --define "_builddir > /tmp/5761-l2tpd-0_69-0_3_20051030_fc5-1141348593/l2tpd/devel" --define "_srcrpmdir /tmp/5761-l2tpd-0_69-0_3_20051030_fc5-1141348593/l2tpd/devel" > --define "_rpmdir /tmp/5761-l2tpd-0_69-0_3_20051030_fc5-1141348593/l2tpd/devel" --define "dist .fc5" --define "fedora 5" --nodeps -bs l2tpd.spec > error: File /tmp/5761-l2tpd-0_69-0_3_20051030_fc5-1141348593/l2tpd/devel/l2tpd-0.69.20051030.tar.gz: No such file or directory > make: *** [srpm] Error 1 > > Paul > -- fedora-extras-list mailing list fedora-extras-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-extras-list
