summaryrefslogtreecommitdiff
path: root/sysui/desktop
diff options
context:
space:
mode:
authorFridrich Štrba <fridrich.strba@bluewin.ch>2010-09-23 08:24:25 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2010-09-28 08:44:12 +0200
commitb1cf810a8e7342ad5d518528fd58266daf6e90ec (patch)
treec2552ca5f1704a1b74d55a6889e3d658d42d06f8 /sysui/desktop
parent89471c04814105a3d819abd054d7ad53c5ac8016 (diff)
LibreOffice branding: make desktop integration work (fix2)
Diffstat (limited to 'sysui/desktop')
-rw-r--r--sysui/desktop/redhat/redhat-menus.spec2
-rw-r--r--sysui/desktop/share/create_tree.sh8
-rw-r--r--sysui/desktop/suse/suse-menus.spec2
3 files changed, 6 insertions, 6 deletions
diff --git a/sysui/desktop/redhat/redhat-menus.spec b/sysui/desktop/redhat/redhat-menus.spec
index cc14a96c3d4a..8328bd35d65b 100644
--- a/sysui/desktop/redhat/redhat-menus.spec
+++ b/sysui/desktop/redhat/redhat-menus.spec
@@ -5,7 +5,7 @@ Summary: %productname desktop integration
Name: %pkgprefix-redhat-menus
Group: Office
License: LGPL
-Vendor: LibreOffice
+Vendor: The Document Foundation
AutoReqProv: no
BuildArch: noarch
Requires: redhat-release
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index e04825df2019..8508f7a4d12a 100644
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -94,15 +94,15 @@ mkdir -p ${DESTDIR}/usr/bin
office_root=/opt/${PREFIX}
-ln -sf ${office_root}/program/soffice ${DESTDIR}/usr/bin/soffice
-
cp openoffice.sh ${DESTDIR}/usr/bin/${PREFIX}
cp printeradmin.sh ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
chmod 0755 ${DESTDIR}/usr/bin/${PREFIX} ${DESTDIR}/usr/bin/${PREFIX}-printeradmin
+ln -sf /usr/bin/${PREFIX} ${DESTDIR}/usr/bin/libreoffice
+
mkdir -p ${DESTDIR}/usr/share/mime/packages
-cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/
-chmod 0644 ${DESTDIR}/usr/share/mime/packages/openoffice.org.xml
+cp openoffice.org.xml ${DESTDIR}/usr/share/mime/packages/libreoffice.xml
+chmod 0644 ${DESTDIR}/usr/share/mime/packages/libreoffice.xml
mkdir -p ${DESTDIR}/usr/share/applications
for i in `cat launcherlist`; do
diff --git a/sysui/desktop/suse/suse-menus.spec b/sysui/desktop/suse/suse-menus.spec
index c73115311019..52df81fc8096 100644
--- a/sysui/desktop/suse/suse-menus.spec
+++ b/sysui/desktop/suse/suse-menus.spec
@@ -280,7 +280,7 @@ for themedir in /opt/gnome/share/icons/gnome /opt/gnome/share/icons/hicolor /opt
done
%files
-%attr(0755,root,root) /usr/bin/soffice
+%attr(0755,root,root) /usr/bin/libreoffice
%attr(0755,root,root) %verify(not size md5) /usr/bin/%unixfilename
%attr(0755,root,root) /usr/bin/%unixfilename-printeradmin
%defattr(0644, root, root)