summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2015-11-03 18:08:54 +0100
committerAndras Timar <andras.timar@collabora.com>2015-11-03 18:09:23 +0100
commitdd8b7bfc252400153b5ec1b52c045c346ad853fe (patch)
treedc18f1148987ecb13f5a555392650a6e4bfbc1e3
parentc36c16c346b411f8862904f0d5f9c5c597363e90 (diff)
sysui: Collabora Office branding
Change-Id: Idfe91c87631956072f1e44d09168de6cd91aed6b
-rwxr-xr-xsysui/desktop/freedesktop/freedesktop-menus.spec3
-rwxr-xr-xsysui/desktop/share/create_tree.sh8
2 files changed, 6 insertions, 5 deletions
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 9c952a50ff01..2d1cd73bc4db 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -24,6 +24,7 @@ Name: %pkgprefix-freedesktop-menus
#BuildRequires: perl
Group: Office
License: LGPLv3 with MPLv2, ALv2 and others
+Provides: collaboraoffice-desktop-integration
Provides: libreoffice-desktop-integration
Conflicts: %pkgprefix-suse-menus
Conflicts: %pkgprefix-debian-menus
@@ -387,7 +388,7 @@ done
# glibc breaks rpm unless rpm is build with internal glob-matching (issue 49374)
# https://bugzilla.redhat.com/beta/show_bug.cgi?id=134362
%defattr(-, root, root)
-%if "%unixfilename" != "libreoffice%productversion" && "%unixfilename" != "libreofficedev%productversion"
+%if "%unixfilename" != "collaboraoffice%productversion" && "%unixfilename" != "collaboraofficedev%productversion"
# compat symlinks
%attr(0755,root,root) /opt/%unixfilename
%endif
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index c6be0bb2a688..912f85520d4b 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -65,14 +65,14 @@ office_root=${office_prefix}/${PREFIX}
#this symlink is needed to have the API boostrap functions running right
ln -sf "${office_root}/program/soffice" "${DESTDIR}/${PREFIXDIR}/bin/${PREFIX}"
-if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != libreofficedev${PRODUCTVERSION} ; then
+if test "${PREFIX}" != collaboraoffice${PRODUCTVERSION} -a "${PREFIX}" != collaboraofficedev${PRODUCTVERSION} ; then
# compat symlinks
mkdir -p "${DESTDIR}${office_prefix}"
- ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}"
- ln -sf /${PREFIXDIR}/bin/${PREFIX} "${DESTDIR}/${PREFIXDIR}/bin/libreoffice${PRODUCTVERSION}"
+ ln -sf collaboraoffice${PRODUCTVERSION} "${DESTDIR}${office_root}"
+ ln -sf /${PREFIXDIR}/bin/${PREFIX} "${DESTDIR}/${PREFIXDIR}/bin/collaboraoffice${PRODUCTVERSION}"
fi
-test "${PREFIX}" = libreofficedev${PRODUCTVERSION} && mime_def_file="libreofficedev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml"
+test "${PREFIX}" = collaboraofficedev${PRODUCTVERSION} && mime_def_file="collaboraofficedev${PRODUCTVERSION}.xml" || mime_def_file="collaboraoffice${PRODUCTVERSION}.xml"
mkdir -p "${DESTDIR}/${PREFIXDIR}/share/mime/packages"
cp openoffice.org.xml "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file"
chmod 0644 "${DESTDIR}/${PREFIXDIR}/share/mime/packages/$mime_def_file"