LibreOffice branding: make desktop integration work (fix2)

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

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

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)