diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-11-03 18:08:54 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-15 23:03:35 +0100 |
| commit | 8604a9ae518c6fb78182242afba01581caa80cf8 (patch) | |
| tree | 41df95122833638258efef9ef78692fe38c345c5 /sysui | |
| parent | OS X: remove LibreOffice readme+license from Collabora Office DMG (diff) | |
| download | core-8604a9ae518c6fb78182242afba01581caa80cf8.tar.gz core-8604a9ae518c6fb78182242afba01581caa80cf8.zip | |
sysui: Collabora Office branding
Change-Id: Idfe91c87631956072f1e44d09168de6cd91aed6b
(cherry picked from commit dd8b7bfc252400153b5ec1b52c045c346ad853fe)
(cherry picked from commit e2a4ac9783408104607bca9bd00f6f333ffe54a2)
Diffstat (limited to 'sysui')
| -rwxr-xr-x | sysui/desktop/freedesktop/freedesktop-menus.spec | 3 | ||||
| -rwxr-xr-x | sysui/desktop/share/create_tree.sh | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec index 959639157de5..b1dd36e3941b 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 @@ -386,7 +387,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 3f24b5fd7bf4..55b08004cd4d 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -60,14 +60,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" |