summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.cz>2011-05-06 20:34:43 +0200
committerPetr Mladek <pmladek@suse.cz>2011-05-06 20:34:43 +0200
commit9a364c2be6732720b3aa9a1f6d81a68e9350dc7f (patch)
tree20baf3de48278894678328d70149035cf60e23fd
parent7a96f3b88bac7e57b5f3c9dff1dbf78bedf0c863 (diff)
do not conflict with /usr/share/mime/packages/libreoffice.xml (fdo#36551)
-rwxr-xr-xsysui/desktop/share/create_tree.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 3aae42763d..2c91ee630a 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