prep error

Thu Oct 15 13:20:30 CEST 2009

W dniu 14.10.2009 22:14, solarflow99 pisze:
> On Thu, Oct 15, 2009 at 2:31 AM, Julian Sikorski <belegdol at gmail.com> wrote:
>> W dniu 14.10.2009 20:10, solarflow99 pisze:
>>> On Thu, Oct 15, 2009 at 1:18 AM, Julian Sikorski <belegdol at gmail.com> wrote:
>>>>
>>>> W dniu 14.10.2009 19:09, Julian Sikorski pisze:
>>>>> W dniu 14.10.2009 18:40, solarflow99 pisze:
>>>>>>
>>>>>>
>>>>>> On Wed, Oct 14, 2009 at 5:04 PM, Lubomir Rintel <lkundrak at v3.sk
>>>>>> <mailto:lkundrak at v3.sk>> wrote:
>>>>>>
>>>>>>     On Wed, 2009-10-14 at 17:01 +0800, solarflow99 wrote:
>>>>>>     > I just have a simple question, I tried adding a new tar file and
>>>>>>     > updated spec file, and it doesnt seem to be able to find any of the
>>>>>>     > source files.  Do I need to upload the whole srpm each time?  Here's
>>>>>>     > what I did, is this right?
>>>>>>     >
>>>>>>     > # make new-sources FILES="dosemu-1.4.0.tgz"
>>>>>>
>>>>>>     Please always call new-sources with the list of all sources you need (no
>>>>>>     matter whether they are already uploaded or not, the upload script will
>>>>>>     find out):
>>>>>>
>>>>>>     make new-sources FILES="my-new-tarball-1.2.tar.gz
>>>>>>     the-other-older-source-file.tgz ..."
>>>>>>
>>>>>>
>>>>>>
>>>>>> you mean like this?  I still didn't work, I still get the same prep
>>>>>> error.  Is it easier to just upload the new srpm somehow?
>>>>>>
>>>>>>  # make new-sources FILES="dosemu-1.4.0.tgz freedos-source.tar.gz
>>>>>> dosemu-freedos-bin.tgz dosemu.desktop"
>>>>>>
>>>>>>
>>>>> Yeah, the command looks OK. The error looks like you forgot to commit
>>>>> and tag the new .cvsignore and sources files.
>>>>>
>>>>> Julian
>>>>>
>>>>>
>>>> I had a quick look at the cvs and it seems that a tag is all that's
>>>> missing.
>>>> $ make tag build
>>>> should do the trick.
>>>
>>> It always fails on me, here's what  get when I try again:
>>>
>>>
>>> # make tag
>>> cvs tag  -c dosemu-1_4_0-10_1988svn_fc11
>>> ERROR: Tag dosemu-1_4_0-10_1988svn_fc11 has been already created.
>>> The following tags have been created so far
>>> dosemu-1_4_0-3_1905svn:F-10:solarflow99:1250698291
>>> dosemu-1_4_0-4_1905svn:F-10:solarflow99:1251140120
>>> dosemu-1_4_0-4_1905svn{?dist}:F-10:solarflow99:1251142813
>>> dosemu-1_4_0-4_1905svn{?dist}:F-10:solarflow99:1251143577
>>> dosemu-1_4_0-4_1905svn_fc10:F-10:solarflow99:1251216053
>>> dosemu-1_4_0-5_1905svn_fc10:F-10:solarflow99:1251338153
>>> dosemu-1_4_0-6_1905svn_fc10:F-10:solarflow99:1251399645
>>> dosemu-1_4_0-7_1981svn_fc11:F-11:solarflow99:1254588904
>>> dosemu-1_4_0-8_1988svn_fc11:F-11:solarflow99:1255458518
>>> dosemu-1_4_0-9_1988svn_fc11:F-11:solarflow99:1255496827
>>> dosemu-1_4_0-10_1988svn_fc11:F-11:solarflow99:1255510425
>>> cvs tag: Pre-tag check failed
>>> cvs [tag aborted]: correct the above errors first!
>>> make: *** [tag] Error 1
>>>
>>>
>>> # make build
>>> PLAGUE_CLIENT_CONFIG=/root/.plague-client-rpmfusion.cfg
>>> /usr/bin/plague-client build dosemu dosemu-1_4_0-10_1988svn_fc11
>>> f11-free
>>> Package dosemu enqueued.  Job ID: 5187.
>>>
>>>
>>> Error: could not make srpm for dosemu-1_4_0-10_1988svn_fc11 - output was:
>>>
>>> Downloading dosemu-1.4.0.tgz...
>>>  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
>>>                                 Dload  Upload   Total   Spent    Left  Speed
>>>
>>>  0 4622k    0  4078    0     0   337k      0  0:00:13 --:--:--  0:00:13  337k
>>> 100 4622k  100 4622k    0     0  47.4M      0 --:--:-- --:--:-- --:--:-- 54.3M
>>> -rw-r--r-- 1 root root 4733469 Oct 13 20:23 dosemu-1.4.0.tgz
>>> rpmbuild --define "_sourcedir
>>> /tmp/5187-dosemu-1_4_0-10_1988svn_fc11-1255543633/dosemu/F-11"
>>> --define "_builddir
>>> /tmp/5187-dosemu-1_4_0-10_1988svn_fc11-1255543633/dosemu/F-11"
>>> --define "_srcrpmdir
>>> /tmp/5187-dosemu-1_4_0-10_1988svn_fc11-1255543633/dosemu/F-11"
>>> --define "_rpmdir
>>> /tmp/5187-dosemu-1_4_0-10_1988svn_fc11-1255543633/dosemu/F-11"
>>> --define "dist .fc11" --define "fedora 11" --define "dist .fc11"
>>> --define "fedora 11" --nodeps -bs dosemu.spec
>>> error: Bad file:
>>> /tmp/5187-dosemu-1_4_0-10_1988svn_fc11-1255543633/dosemu/F-11/freedos-source.tar.gz:
>>> No such file or directory
>>> error: Bad file:
>>> /tmp/5187-dosemu-1_4_0-10_1988svn_fc11-1255543633/dosemu/F-11/dosemu.desktop:
>>> No such file or directory
>>> error: Bad file:
>>> /tmp/5187-dosemu-1_4_0-10_1988svn_fc11-1255543633/dosemu/F-11/dosemu-freedos-bin.tgz:
>>> No such file or directory
>>> RPM build errors:
>>>    Bad file: /tmp/5187-dosemu-1_4_0-10_1988svn_fc11-1255543633/dosemu/F-11/freedos-source.tar.gz:
>>> No such file or directory
>>>    Bad file: /tmp/5187-dosemu-1_4_0-10_1988svn_fc11-1255543633/dosemu/F-11/dosemu.desktop:
>>> No such file or directory
>>>    Bad file: /tmp/5187-dosemu-1_4_0-10_1988svn_fc11-1255543633/dosemu/F-11/dosemu-freedos-bin.tgz:
>>> No such file or directory
>>> make: *** [srpm] Error 1
>>>
>> Your old tag is incorrect, try
>> $ make force-tag build
>> You have most likely tagged a set of files which contained old
>> .cvsignore and sources. Alternatively, bump release, commit, tag and build.
> 
> thanks to everyone for the help, it succeeded now.  I'd just like to
> ask what is the usual update procedure then, what are the commands to
> update a branch, is it this?
> 
> make new-sources FILES="foo-0.0.2.tar.bz2 foo.desktop foo-source, etc."
> update the release in the spec file
> cvs diff -u
> make clog
> cvs commit -F clog
> rm clog
> make tag build
> 
> 
> how to do it with the src rpm for a new branch when F-12 comes out?
> 
> Thanks,
> 
Yeah, that's pretty much correct. cvs diff -u is not necessary, it's
just useful to make sure what you have changed.
As far as the branches are concerned, you need to do this procedure in
each one separately. You don't need to upload new sources if they are
the same, though, it's enough to copy over sources and .cvsignore files.
You also need to make sure that upgrade paths are correct, i.e. that EVR
in F-n is higher than in F-(n-1). HTH.

Julian