$NetBSD: patch-bin_distro-install-desktop-integration,v 1.1 2015/03/12 02:59:04 ryoon Exp $ --- bin/distro-install-desktop-integration.orig 2015-01-22 20:05:28.000000000 +0000 +++ bin/distro-install-desktop-integration @@ -94,13 +94,13 @@ add_wrapper() } # install desktop integration from plain packages -sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX` +sysui_temp=`mktemp -d -t distro-pack-desktop-integration-XXXXXX` cp -a workdir/CustomTarget/sysui/share/libreoffice/* "$sysui_temp" cp -a sysui/desktop/share/create_tree.sh "$sysui_temp" builddir=`pwd` cd $sysui_temp # we want non-versioned stuff in the distro packages -sed -i \ +gsed -i \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ @@ -111,6 +111,7 @@ sed -i \ export PREFIX=$INSTALLDIRNAME export ICON_PREFIX=$INSTALLDIRNAME export ICON_SOURCE_DIR=$builddir/sysui/desktop/icons + export APPDATA_SOURCE_DIR=$builddir/sysui/desktop/appstream-appdata export PRODUCTVERSION= export KDEMAINDIR=$PREFIXDIR export PREFIXDIR=${PREFIXDIR} @@ -130,7 +131,7 @@ fi # we want non-versioned desktop files cd $DESTDIR/$INSTALLDIR/share/xdg # we want non-versioned stuff in the distro packages -sed -i \ +gsed -i \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ @@ -145,7 +146,7 @@ if test -f $DESTDIR/gid_Module_Root_Bran $PREFIXDIR/share/mime/packages \ $PREFIXDIR/share/mime-info \ $PREFIXDIR/share/icons ; do - find "$DESTDIR$dir" \( -type f -o -type l \) -printf "$dir/%P\n" >>$DESTDIR/gid_Module_Root_Brand + find "$DESTDIR$dir" \( -type f -o -type l \) -print | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand done fi