Re: [Libreoffice] REVIEW: allow to call "make distro-pack-install" with normal user

Andreas Radke píše v Po 18. 07. 2011 v 18:40 +0200:
> Am Mon, 18 Jul 2011 18:11:00 +0200
> schrieb Andreas Radke <a.radke@arcor.de>:
>
> > Am Mon, 18 Jul 2011 12:39:26 +0200
> > schrieb Petr Mladek <pmladek@suse.cz>:
> >
> > > Hi,
> > >
> > > the attached patch fixes two problems found when calling make
> > > distro-pack-install" as normal user.
> > >
> > > It would be great to get it into libreoffice-3-4-2 branch.
> > >
> > >
> > > Best Regards,
> > > Petr
> >
> > Booth issues seem fixed for me. Thanks.
> >
> > -Andy
>
> Hm. Maybe too fast answered. How do you build your packages?
>
> I'm doing a fake install with: 
> make DESTDIR=${srcdir}/fakeinstall distro-pack-install

I use make DESTDIR=$RPM_BUILD_ROOT distro-pack-install.

The variable RPM_BUILD_ROOT points
to /vat/tmp/<packname>-<version>-<arch>.

The rpm tool creates the packages directly from there using the file
lists. So, I do not need to move the files after they are installed.

> That doesn't move the /usr/bin/soffice symlink into the common pkg. No
> big deal. I can recreate it but maybe I would miss other links in
> future builds as well.
>
> Do you have a more elegant way that prevents this?

Ah, the file was not mentioned in the file list. It should get fixed by
the attached patch.


Thanks for testing.

Best Regards,
Petr

From 2046eaeaaabbc58326066ee37f53cc97ebf679bb Mon Sep 17 00:00:00 2001
From: Petr Mladek <pmladek@suse.cz>
Date: Mon, 18 Jul 2011 19:47:39 +0200
Subject: [PATCH 4/4] distro-install-desktop-integration: put $PREFIXDIR/bin/soffice into file list

---
 bin/distro-install-desktop-integration |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration
index 9e3b499..77ccf3a 100755
--- a/bin/distro-install-desktop-integration
+++ b/bin/distro-install-desktop-integration
@@ -161,6 +161,7 @@ add_wrapper unopkg         unopkg  ""            "unopkg"      ""
 #       For example, the Novell package mark this symlink as %ghost
 #      and update it in %post and %postun
 ln -sf $INSTALLDIR/program/soffice $DESTDIR$PREFIXDIR/bin/soffice
+test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" 
> > $DESTDIR/gid_Module_Root_Brand
 
 # create bash completion
 mkdir -p $DESTDIR/etc/bash_completion.d
-- 
1.7.3.4