--- ./bin/distro-install-desktop-integration.orig 2012-03-27 18:22:01.000000000 +0200 +++ ./bin/distro-install-desktop-integration 2012-04-23 19:17:27.574712717 +0200 @@ -91,13 +91,13 @@ } # install desktop integration from plain packages -sysui_temp=`mktemp -t -d distro-pack-desktop-integration-XXXXXX` -cp -a sysui/unxlng*/misc/libreoffice/* "$sysui_temp" +sysui_temp=`mktemp -d /tmp/distro-pack-desktop-integration-XXXXXX` +cp -a sysui/unx*/misc/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 \ +sed -i "" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ @@ -111,16 +111,17 @@ export PRODUCTVERSION= export KDEMAINDIR=$PREFIXDIR export GNOMEDIR=$PREFIXDIR + export PREFIXDIR=$PREFIXDIR export GNOME_MIME_THEME=hicolor - /bin/bash ./create_tree.sh + bash ./create_tree.sh ) cd - rm -rf $sysui_temp # we do not want some stuff from the plain packages rm -f $DESTDIR/$PREFIXDIR/bin/$INSTALLDIRNAME-printeradmin -rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-javafilter.desktop -rm -f $DESTDIR$PREFIXDIR/share/applications/libreoffice-printeradmin.desktop +rm -f $DESTDIR/$PREFIXDIR/share/applications/libreoffice-javafilter.desktop +rm -f $DESTDIR/$PREFIXDIR/share/applications/libreoffice-printeradmin.desktop if test -d $DESTDIR/opt ; then rm -f $DESTDIR/opt/$INSTALLDIRNAME rmdir --ignore-fail-on-non-empty $DESTDIR/opt @@ -129,7 +130,7 @@ # we want non-versioned desktop files cd $DESTDIR/$INSTALLDIR/share/xdg # we want non-versioned stuff in the distro packages -sed -i \ +sed -i "" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION_NODOT/\1/" \ -e "s/\($INSTALLDIRNAME\)$PRODUCTVERSION/\1/" \ -e "s/\($PRODUCTNAME\) $PRODUCTVERSION/\1/" \ @@ -144,7 +145,7 @@ $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 \) | sed -e "s|^$DESTDIR||" >>$DESTDIR/gid_Module_Root_Brand done fi