Re: [Libreoffice] [REVIEW] more distro-pack-install fixes
Andreas Radke píše v Po 18. 07. 2011 v 18:18 +0200: Am Mon, 18 Jul 2011 16:58:03 +0200 schrieb Petr Mladek pmla...@suse.cz: Hi, the below patches should fix two more problems reported by Andy. I would like to get them into libreoffice-3-4-2 branch. Best Regards, Petr The first patch works as expected. The second patch doesn't fix the file list creation for me. As discussed on irc. Andy forgot to run autogen.sh. All the fixes worked for him in the end: --- cut --- [23:12:38] andyrtr_laptop pmladek, thanks. all your patches so far work well now. now applying the permission fix. --- cut --- Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice] [REVIEW] more distro-pack-install fixes
Hi, the below patches should fix two more problems reported by Andy. I would like to get them into libreoffice-3-4-2 branch. Best Regards, Petr From 7b202653f352a6c1bd18066bc71c93b1a5b33c13 Mon Sep 17 00:00:00 2001 From: Petr Mladek pmla...@suse.cz Date: Mon, 18 Jul 2011 16:48:49 +0200 Subject: [PATCH 2/3] distro-install-desktop-integration: do not pack libreoffice-base.desktop twice --- bin/distro-install-desktop-integration |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bin/distro-install-desktop-integration b/bin/distro-install-desktop-integration index 600c54e..9e3b499 100755 --- a/bin/distro-install-desktop-integration +++ b/bin/distro-install-desktop-integration @@ -148,7 +148,7 @@ add_wrapper lomath soffice --math libreoffice libreoffice-mat add_wrapper loimpress soffice --impresslibreoffice libreoffice-impress.desktop gid_Module_Brand_Prg_Impress add_wrapper loweb soffice --weblibreoffice gid_Module_Brand_Prg_Wrt add_wrapper lowriter soffice --writer libreoffice libreoffice-writer.desktop gid_Module_Brand_Prg_Wrt -add_wrapper lofromtemplate soffice .uno:NewDoc libreoffice libreoffice-base.desktopgid_Module_Root_Brand +add_wrapper lofromtemplate soffice .uno:NewDoc libreoffice gid_Module_Root_Brand add_wrapper libreofficesoffice libreoffice libreoffice-startcenter.desktop gid_Module_Root_Brand add_wrapper lofficesoffice libreoffice gid_Module_Root_Brand add_wrapper unopkg unopkg unopkg gid_Module_Root_Brand -- 1.7.3.4 From 72d5c4c3f7d2a5d329eb74fa1d1f69c1fb8c15b9 Mon Sep 17 00:00:00 2001 From: Petr Mladek pmla...@suse.cz Date: Mon, 18 Jul 2011 16:50:18 +0200 Subject: [PATCH 3/3] distro-install: fix en-US-only installation generate en-US file list when --with-distro= sigh, we should set WITH_LANG=en-US when no language is selected; the empty string is pretty ugly; unforrunately, many makefile tests check for this empty variable --- configure.in |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/configure.in b/configure.in index 18f93d2..65813cb 100755 --- a/configure.in +++ b/configure.in @@ -7906,6 +7906,9 @@ for lang in $WITH_LANG ; do done # list with substituted ALL WITH_LANG_LIST=`echo $WITH_LANG | sed s/ALL/$ALL_LANGS/` +# this variable is used only by bin/distro-install-* helper scripts +# they need a real list of languages +test -z $WITH_LANG_LIST WITH_LANG_LIST=en-US AC_SUBST(ALL_LANGS) AC_SUBST(WITH_LANG) AC_SUBST(WITH_LANG_LIST) -- 1.7.3.4 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] more distro-pack-install fixes
Am Mon, 18 Jul 2011 16:58:03 +0200 schrieb Petr Mladek pmla...@suse.cz: Hi, the below patches should fix two more problems reported by Andy. I would like to get them into libreoffice-3-4-2 branch. Best Regards, Petr The first patch works as expected. The second patch doesn't fix the file list creation for me. I'm using --with-lang= in configure that says: checking which languages to be built... en-US that's all I get here: [andyrtr@workstation64 trunk]$ ls -1 ~/arch64/chroots/testing-x86_64/andyrtr/build/src/build/file-lists/ base_list.txt calc_list.txt common_list.txt draw_list.txt gnome_list.txt impress_list.txt kde4_list.txt kde_list.txt math_list.txt mono_list.txt orig sdk_doc_list.txt sdk_list.txt writer_list.txt in orig folder there are : gid_Module_Helppack_Help_en_US gid_Module_Langpack_Base_en_US gid_Module_Langpack_Basis_en_US gid_Module_Langpack_Brand_en_US gid_Module_Langpack_Calc_en_US gid_Module_Langpack_Math_en_US gid_Module_Langpack_Resource_en_US gid_Module_Langpack_Writer_en_US gid_Module_Oo_Linguistic Do you need some further infos? ** Successful packaging process! *** Installer finished Installation finished, you can now execute: /usr/lib/libreoffice/program/soffice ./bin/distro-install-clean-up Cleaning up ... Fixing permissions... Checking for DESTDIR inside installed files... ./bin/distro-install-desktop-integration Copying icons .. Copying GNOME icons .. chmod: cannot operate on dangling symlink `/build/src/fakeinstall/usr/bin/libreoffice' /build/src/build /build/src/build Install /usr/bin/lobase Install /usr/share/man/man1/lobase.1.gz Install /usr/bin/localc Install /usr/share/man/man1/localc.1.gz Install /usr/bin/lodraw Install /usr/share/man/man1/lodraw.1.gz Install /usr/bin/lomath Install /usr/share/man/man1/lomath.1.gz Install /usr/bin/loimpress Install /usr/share/man/man1/loimpress.1.gz Install /usr/bin/loweb Install /usr/share/man/man1/loweb.1.gz Install /usr/bin/lowriter Install /usr/share/man/man1/lowriter.1.gz Install /usr/bin/lofromtemplate Install /usr/share/man/man1/lofromtemplate.1.gz Install /usr/bin/libreoffice Install /usr/share/man/man1/libreoffice.1.gz Install /usr/bin/loffice Install /usr/share/man/man1/loffice.1.gz Install /usr/bin/unopkg Install /usr/share/man/man1/unopkg.1.gz Install /basis/program/java-set-classpath ./bin/distro-install-sdk SDK installation clean up ./bin/distro-install-file-lists Generating package file lists for ArchLinux... -Andy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice] [REVIEW] more distro-pack-install fixes
Petr Mladek píše v Po 18. 07. 2011 v 16:58 +0200: Hi, the below patches should fix two more problems reported by Andy. I would like to get them into libreoffice-3-4-2 branch. One more fix. We finally install /usr/bin/soffice into $DESTDIR. We need to put it into the file list as well. Best Regards, Petr From 2046eaeaaabbc58326066ee37f53cc97ebf679bb Mon Sep 17 00:00:00 2001 From: Petr Mladek pmla...@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 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
