[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sysui/desktop

[Petr Mladek]

 sysui/desktop/share/create_tree.sh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9a364c2be6732720b3aa9a1f6d81a68e9350dc7f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri May 6 20:34:43 2011 +0200

    do not conflict with /usr/share/mime/packages/libreoffice.xml (fdo#36551)

diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 3aae427..2c91ee6 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -110,8 +110,8 @@ if test "${PREFIX}" != libreoffice${PRODUCTVERSION} ; then
 fi
 
 mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice.xml
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/libreoffice.xml
+cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml
+chmod 0644 ${DESTDIR}/usr/share/mime/packages/libreoffice${PRODUCTVERSION}.xml
 
 mkdir -p ${DESTDIR}/usr/share/applications
 for i in `cat launcherlist`; do