FAQ Search Today's Posts Mark Forums Read

» Linux Archive
Home
New Posts
Search
FAQ


Go Back   Linux Archive > Redhat > Fedora Development

 
 
LinkBack Thread Tools
 
Old 12-11-2007, 06:56 PM
"Jon Ciesla"
 
Default how to use Source1 to add an additional file

>
> 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@redhat.com
> https://www.redhat.com/mailman/listinfo/fedora-devel-list
>


--
novus ordo absurdum

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list
 
Old 12-11-2007, 07:58 PM
Qianqian Fang
 
Default how to use Source1 to add an additional file

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@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list








--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list
 
Old 12-11-2007, 08:01 PM
"Jon Ciesla"
 
Default how to use Source1 to add an additional file

> 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

You have to bump the revision and re-run "make tag".

> 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@redhat.com
>>> https://www.redhat.com/mailman/listinfo/fedora-devel-list
>>>
>>>
>>
>>
>>
>


--
novus ordo absurdum

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list
 
Old 12-11-2007, 08:07 PM
Nicolas Mailhot
 
Default how to use Source1 to add an additional file

Hi,

Don't hesitate to create a srpm you test locally and then use
cvs-import.sh. People will tell you direct cvs use is much faster except
you're probably already wasted many times that. And it was your personal
time not computer time.

Some "optimization".

Regards,

--
Nicolas Mailhot
--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list
 
Old 12-11-2007, 08:49 PM
Michael Schwendt
 
Default how to use Source1 to add an additional file

On Tue, 11 Dec 2007 14:58:53 -0500, Qianqian Fang wrote:

> 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.

It's not strange. It's expected, because you have yet to give your
modified files a new tag with "make tag". Don't forget to increase
"Release" appropriately.

Your last tag is applied to the old files:
cvs co -r wqy-bitmap-fonts-0_9_9-1_fc9 wqy-bitmap-fonts

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list
 
Old 12-11-2007, 08:59 PM
Ville Skyttä
 
Default how to use Source1 to add an additional file

On Tuesday 11 December 2007, Qianqian Fang wrote:
> hi Jon
>
> thank you for the reply, I did as you suggested:
>
> make new-sources FILES "upstreamsource.tar.gz 61-wqy-bitmapsong.conf"

Unless this was a copy-pasto, there's a '=' missing, try
make new-sources FILES="upstreamsource.tar.gz 61-wqy-bitmapsong.conf"

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list
 
Old 12-12-2007, 01:12 AM
Qianqian Fang
 
Default how to use Source1 to add an additional file

I did a "make tag" as suggested, and check the cvsweb, and all
needed files seem to be tagged correctly (0.9.9-2), then I run "make i386",
na! it failed again, hit the same error message!

Even I put the 61-*.conf to my local SOURCE directory, and try to
build a local srpm as Nicolas suggested, it could not get through
either, same error.

any other thoughts?

btw: can anyone point me to a good rpm manual? I read the UpdatingPackage
page from Fedora wiki, and googled a few tutorials, but none
of them elaborates on this, or maybe I did not read careful enough?


Jon Ciesla wrote:


You have to bump the revision and re-run "make tag".



--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list
 
Old 12-12-2007, 01:25 AM
Mamoru Tasaka
 
Default how to use Source1 to add an additional file

Qianqian Fang wrote, at 12/12/2007 03:39 AM +9:00:

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/61-wqy-bitmapsong.conf




did I miss anything? where should I put the 61-wqy-bitmapsong.conf
when commit to cvs?


Well, the problem is not there. Actually the build log says
/etc/fonts/conf.d/61-wqy-bitmapsong.conf is found but your spec
file reads:

----------------------------------------------
%files
....................
%config(noreplace) %{fontconfdir}/%{SOURCE1}
----------------------------------------------
Here SOURCE1 is expanded to %_sourcedir/`basename %SOURCE1`.
As the result %{fontconfdir}/%{SOURCE1} is not found but
/etc/fonts/conf.d/61-wqy-bitmapsong.conf is left installed
but not registered.

Regards,
Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list
 
Old 12-12-2007, 01:32 AM
Laurent Rineau
 
Default how to use Source1 to add an additional file

On Tuesday 11 December 2007 19:39:26 Qianqian Fang wrote:
> File Not found: ..../wqy-bitmap-fonts/devel/61-wqy-bitmapsong.conf
> Installed (but unpackaged) file(s) found
> /etc/fonts/conf.d/61-wqy-bitmapsong.conf

I tried to compile your package, and I got the following error:
RPM build errors:
File not
found: /var/tmp/wqy-bitmap-fonts-0.9.9-2.fc9-root-lrineau/etc/fonts/conf.d/home/lrineau/Fedora/wqy-bitmap-fonts/devel/61-wqy-bitmapsong.conf


Its your %files section that is incorrect!

Change this:
%config(noreplace) %{fontconfdir}/%{SOURCE1}
to that:
%config(noreplace) %{fontconfdir}/61-wqy-bitmapsong.conf
or even:
%config(noreplace) %{fontconfdir}/*.conf

The explanation of the error is that ${SOURCE1} is expanded to a full path,
and not just a file name. That is why the error log shows a very long path.

--
Laurent Rineau
http://fedoraproject.org/wiki/LaurentRineau

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list
 
Old 12-12-2007, 02:34 AM
Qianqian Fang
 
Default how to use Source1 to add an additional file

hi Laurent and Mamoru

thank you so much, that solved the problem!

Qianqian

Laurent Rineau wrote:

On Tuesday 11 December 2007 19:39:26 Qianqian Fang wrote:


File Not found: ..../wqy-bitmap-fonts/devel/61-wqy-bitmapsong.conf
Installed (but unpackaged) file(s) found
/etc/fonts/conf.d/61-wqy-bitmapsong.conf



I tried to compile your package, and I got the following error:
RPM build errors:
File not
found: /var/tmp/wqy-bitmap-fonts-0.9.9-2.fc9-root-lrineau/etc/fonts/conf.d/home/lrineau/Fedora/wqy-bitmap-fonts/devel/61-wqy-bitmapsong.conf



Its your %files section that is incorrect!

Change this:
%config(noreplace) %{fontconfdir}/%{SOURCE1}
to that:
%config(noreplace) %{fontconfdir}/61-wqy-bitmapsong.conf
or even:
%config(noreplace) %{fontconfdir}/*.conf

The explanation of the error is that ${SOURCE1} is expanded to a full path,
and not just a file name. That is why the error log shows a very long path.





--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list
 

Thread Tools




All times are GMT. The time now is 11:31 PM.

VBulletin, Copyright ©2000 - 2008, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright ©2007 - 2008, www.linux-archive.org