diff options
Diffstat (limited to 'editors/libreoffice/files/patch-bin_distro-install-desktop-integration')
| -rw-r--r-- | editors/libreoffice/files/patch-bin_distro-install-desktop-integration | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/editors/libreoffice/files/patch-bin_distro-install-desktop-integration b/editors/libreoffice/files/patch-bin_distro-install-desktop-integration index c47689ddee3c..85241e2dcbac 100644 --- a/editors/libreoffice/files/patch-bin_distro-install-desktop-integration +++ b/editors/libreoffice/files/patch-bin_distro-install-desktop-integration @@ -1,6 +1,6 @@ ---- bin/distro-install-desktop-integration.orig 2018-02-23 01:45:41.000000000 +0800 -+++ bin/distro-install-desktop-integration 2018-03-16 09:45:26.157822000 +0800 -@@ -99,7 +99,7 @@ cp -a workdir/CustomTarget/sysui/share/libreoffice/* " +--- bin/distro-install-desktop-integration.orig 2019-01-24 03:35:25.000000000 +0800 ++++ bin/distro-install-desktop-integration 2019-02-03 18:17:18.645630000 +0800 +@@ -98,7 +98,7 @@ cp -a "${SRCDIR?}"/sysui/desktop/share/create_tree.sh "$sysui_temp" cd $sysui_temp # we want non-versioned stuff in the distro packages @@ -9,7 +9,7 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -109,13 +109,13 @@ sed -i \ +@@ -108,13 +108,13 @@ export OFFICE_PREFIX=$LIBDIR export PREFIX=$INSTALLDIRNAME export ICON_PREFIX=$INSTALLDIRNAME @@ -25,7 +25,7 @@ bash ./create_tree.sh ) cd - -@@ -130,7 +130,7 @@ fi +@@ -129,7 +129,7 @@ # we want non-versioned desktop files cd $DESTDIR/$INSTALLDIR/share/xdg # we want non-versioned stuff in the distro packages @@ -34,7 +34,7 @@ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ -@@ -144,7 +144,7 @@ if test -f $DESTDIR/gid_Module_Root_Brand ; then +@@ -143,7 +143,7 @@ $PREFIXDIR/share/mime/packages \ $PREFIXDIR/share/mime-info \ $PREFIXDIR/share/icons ; do @@ -43,13 +43,13 @@ done fi -@@ -172,16 +172,16 @@ test -f $DESTDIR/gid_Module_Optional_Xsltfiltersamples +@@ -171,16 +171,16 @@ # you cannot include this link directly into the package # 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 +-ln -sf "$INSTALLDIR/program/soffice" "$DESTDIR$BINDIR/soffice" +ln -sf ../lib/libreoffice/program/soffice $DESTDIR$PREFIXDIR/bin/soffice - test -f $DESTDIR/gid_Module_Root_Brand && echo "$PREFIXDIR/bin/soffice" >>$DESTDIR/gid_Module_Root_Brand + test -f $DESTDIR/gid_Module_Root_Brand && echo "$BINDIR/soffice" >>$DESTDIR/gid_Module_Root_Brand # create bash completion -mkdir -p $DESTDIR/usr/share/bash-completion/completions |