On Wed, Jan 19, 2011 at 03:53:00PM +0300, Vadim Zhukov wrote:
> On 19 January 2011 ?. 11:18:12 Landry Breuil wrote:
> > On Wed, Jan 19, 2011 at 06:04:17AM +0300, Vadim Zhukov wrote:
> > > On 18 January 2011 ?. 22:09:53 Marco Peereboom wrote:
> > > > anyone?
> > >
> > > Oops, there is packaging problem with .desktop file: pkg-subst replaces
> > > TRUEPREFIX only in the beginning of line, so the file is actually
> > > copied with ${TRUEPREFIX}/bin/xxxterm (and so) line itself. Updated
> > > patch below.
> >
> > > - @${SUBST_CMD} -c ${WRKSRC}/xxxterm.desktop
> > > ${PREFIX}/share/applications/xxxterm.desktop
> > > - ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop ${PREFIX}/share/applications/
> > > - ${CHOWN} ${SHAREOWN}:${SHAREGRP}
> > > $(PREFIX)/share/applications/xxxterm.desktop
> > > + ${INSTALL_DATA} ${WRKSRC}/xxxterm.desktop
> > > ${PREFIX}/share/applications/xxxterm.desktop
> > > + ${SUBST_CMD} ${PREFIX}/share/applications/xxxterm.desktop
> >
> > It's more wrong. subst was done on the source file and was installed to
> > prefix, then overwritten by the install_data just after.
>
> Yes.
>
> > you can also just use
> > ${SUBST_CMD} -o ${SHAREOWN} -g ${SHAREGRP} -c ${WRKSRC}/xxxterm.desktop
> > ${PREFIX}/share/applications/xxxterm.desktop
> > instead of doing install+subst
>
> But then you have to do chown anyway, since SUBST_CMD does not support
> "-m mode" switch. Is anyone supported in it, BTW?
Why do you think you need -m mode here ? go read
infrastructure/bin/pkg_subst, if the source file has the correct perms
they will be carried on to the dest file. If it doesn't, well fix it
upstream :)
Oh, and marco btw, you can fix it yourself. There's no rocket
science here, i gave you the line.
Landry
