how to use Source1 to add an additional file

[Qianqian Fang]

hi Jon

thank you for the reply, I did as you suggested:

make new-sources FILES "upstreamsource.tar.gz 61-wqy-bitmapsong.conf"
cvs commit
cvs up
make i386

strangely, I am getting the same error as before.
I also tried to use "cvs add 61-wqy-bitmapsong.conf", but "make i386"
failed in the same way.

the cvs of the package is at
http://cvs.fedoraproject.org/viewcvs/rpms/wqy-bitmap-fonts/devel/
and the .cvsignore and source files do include the new conf file.

do you think there could be other places wrong?
thank you

Qianqian


Jon Ciesla wrote:
>> On Tue, 2007-12-11 at 12:36 -0600, Jon Ciesla wrote:
>>     
>>>> hi
>>>>
>>>> I want to add a separate configuration file (61-wqy-bitmapsong.conf)
>>>> to package wqy-bitmap-fonts, after reading some examples, I used
>>>> the following syntax to make this change
>>>>
>>>> ....
>>>> Source0: http://url of the upstream package
>>>> Source1: 61-wqy-bitmapsong.conf  # the additional file
>>>> ....
>>>>
>>>> %setup -q -n %{wqyroot}
>>>> ...
>>>> %install
>>>> ...
>>>> install -p -m644 %{SOURCE1} %{buildroot}%{fontconfigdir}/
>>>> ...
>>>>
>>>> then I copied 61-wqy-bitmapsong.conf  to "devel" directory,
>>>> and "cvs add 61-wqy-bitmapsong.conf". However, it failed when
>>>> I test the build with "make i386", the error message is
>>>>
>>>> File Not found: ..../wqy-bitmap-fonts/devel/61-wqy-bitmapsong.conf
>>>> Installed (but unpackaged) file(s) found
>>>> /etc/fonts/conf.d/http://kronos/wfc/logon
>>>>
>>>> did I miss anything? where should I put the 61-wqy-bitmapsong.conf
>>>> when commit to cvs?
>>>>         
>>> make new-sources FILES="/path/to/main/src/file
>>> /path/to/61-wqy-bitmapsong.conf"
>>>
>>> then cvs commit.
>>>       
>> Alternatively, make srpm, then install the srpm, work on the package in
>> your rpmbuild tree and then cvs-import.sh it. In that case you'll not
>> have to worry about adding/removing files to/from cvs and uploading the
>> sources. But it indeed is an overkill for small changes.
>>     
>
> I've actually been explicitly told not to do that except for the initial
> import.  Plus, I find that the plain cvs commands are faster, especially
> with ssh-agent. :)
>
>   
>> --
>> Lubomir Kundrak (Red Hat Security Response Team)
>>
>> --
>> fedora-devel-list mailing list
>> fedora-devel-list at redhat.com
>> https://www.redhat.com/mailman/listinfo/fedora-devel-list
>>
>>     
>
>
>