summaryrefslogtreecommitdiff
path: root/sysui
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
commit75459735b3cd9010570d63ddc3432f22d2c46bd8 (patch)
tree6276c7d48225d3170c4a0ae14bb4b8575d3e1fd9 /sysui
parentbcdacc09dd653f077b59cce7c6a9ae0c1ef9d4b0 (diff)
LibreOffice branding: make desktop integration work (fix2)
Diffstat (limited to 'sysui')
-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 cc14a96c3d..8328bd35d6 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 84af1c75a4..ebe13262bf 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 c731153110..52df81fc80 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)