diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-03-20 16:59:48 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-21 08:56:45 +0000 |
commit | a547f865e0ce7731e1b3998b06ecba505e1c27ca (patch) | |
tree | d018b8040ceb3597fcf497903986eaea68dede02 /sysui | |
parent | 52cc0c8f05d40db6d076c13f8b8d6d9453ec8930 (diff) |
drop spadmin
Change-Id: Ie10ee80f1d35b40c0baf9d7ba5c1181b52405b5f
Diffstat (limited to 'sysui')
-rw-r--r-- | sysui/CustomTarget_share.mk | 8 | ||||
-rw-r--r-- | sysui/desktop/man/libreoffice.1 | 2 | ||||
-rwxr-xr-x | sysui/desktop/share/create_tree.sh | 4 | ||||
-rwxr-xr-x | sysui/desktop/share/printeradmin.sh | 3 | ||||
-rwxr-xr-x | sysui/desktop/solaris/prototype | 2 |
5 files changed, 2 insertions, 17 deletions
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk index 7851156b4dbe..862e57f51f0a 100644 --- a/sysui/CustomTarget_share.mk +++ b/sysui/CustomTarget_share.mk @@ -130,7 +130,6 @@ $(eval $(call gb_CustomTarget_register_targets,sysui/share,\ $(product)/openoffice.applications \ $(product)/openoffice.keys \ $(product)/openoffice.sh \ - $(product)/printeradmin.sh \ $(product)/create_tree.sh \ $(product)/mimelnklist \ $(product)/launcherlist) \ @@ -172,12 +171,7 @@ $(share_WORKDIR)/%/openoffice.sh: $(share_SRCDIR)/share/openoffice.sh $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1) cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" > $@ -$(share_WORKDIR)/%/printeradmin.sh: $(share_SRCDIR)/share/printeradmin.sh - mkdir -p $(dir $@) - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CAT,1) - cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$*)/g" > $@ - -$(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh $(share_WORKDIR)/%/mimelnklist $(share_WORKDIR)/%/printeradmin.sh \ +$(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh $(share_WORKDIR)/%/mimelnklist \ $(share_WORKDIR)/%/openoffice.org.xml $(share_WORKDIR)/%/openoffice.applications $(share_WORKDIR)/%/openoffice.mime \ $(share_WORKDIR)/%/openoffice.keys $(share_WORKDIR)/%/launcherlist mkdir -p $(dir $@) diff --git a/sysui/desktop/man/libreoffice.1 b/sysui/desktop/man/libreoffice.1 index 68793ff2c0b6..8847d535700f 100644 --- a/sysui/desktop/man/libreoffice.1 +++ b/sysui/desktop/man/libreoffice.1 @@ -43,7 +43,7 @@ passes the command line arguments to the \fBsoffice.bin\fR binary. Alternatively, the following helper scripts start the respective module: -sbase, scalc, sdraw, simpress, smath, sofficerc, spadmin, swriter +sbase, scalc, sdraw, simpress, smath, sofficerc, swriter .SH OPTIONS .TP diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh index 0843f2e72b12..2221a4663417 100755 --- a/sysui/desktop/share/create_tree.sh +++ b/sysui/desktop/share/create_tree.sh @@ -65,15 +65,11 @@ office_root=${office_prefix}/${PREFIX} #this symlink is needed to have the API boostrap functions running right ln -sf "${office_root}/program/soffice" "${DESTDIR}/usr/bin/${PREFIX}" -cp printeradmin.sh "${DESTDIR}/usr/bin/${PREFIX}-printeradmin" -chmod 0755 "${DESTDIR}/usr/bin/${PREFIX}-printeradmin" - if test "${PREFIX}" != libreoffice${PRODUCTVERSION} -a "${PREFIX}" != libreofficedev${PRODUCTVERSION} ; then # compat symlinks mkdir -p "${DESTDIR}${office_prefix}" ln -sf libreoffice${PRODUCTVERSION} "${DESTDIR}${office_root}" ln -sf /usr/bin/${PREFIX} "${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}" - ln -sf /usr/bin/${PREFIX}-printeradmin "${DESTDIR}/usr/bin/libreoffice${PRODUCTVERSION}-printeradmin" fi test "${PREFIX}" = libreofficedev${PRODUCTVERSION} && mime_def_file="libreofficedev${PRODUCTVERSION}.xml" || mime_def_file="libreoffice${PRODUCTVERSION}.xml" diff --git a/sysui/desktop/share/printeradmin.sh b/sysui/desktop/share/printeradmin.sh deleted file mode 100755 index 0eb631f345f0..000000000000 --- a/sysui/desktop/share/printeradmin.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /opt/%PREFIX/program/spadmin diff --git a/sysui/desktop/solaris/prototype b/sysui/desktop/solaris/prototype index 6b1360a2eff2..145c76ee13dc 100755 --- a/sysui/desktop/solaris/prototype +++ b/sysui/desktop/solaris/prototype @@ -8,7 +8,6 @@ d none usr 0755 root sys d none usr/bin 0755 root bin s none usr/bin/soffice=../../opt/%PREFIX/program/soffice f none usr/bin/%PREFIX=%SOURCE/openoffice.sh 0755 root bin -f none usr/bin/%PREFIX-printeradmin=%SOURCE/printeradmin.sh 0755 root bin d none usr/share 0755 root sys d none usr/share/applications 0755 root other d none usr/share/mime 0755 root root @@ -37,7 +36,6 @@ f none usr/share/pixmaps/%ICONPREFIX-draw.png=../icons/hicolor/48x48/apps/draw.p f none usr/share/pixmaps/%ICONPREFIX-impress.png=../icons/hicolor/48x48/apps/impress.png f none usr/share/pixmaps/%ICONPREFIX-math.png=../icons/hicolor/48x48/apps/math.png f none usr/share/pixmaps/%ICONPREFIX-base.png=../icons/hicolor/48x48/apps/base.png -f none usr/share/pixmaps/%ICONPREFIX-printeradmin.png=../icons/hicolor/48x48/apps/printeradmin.png f none usr/share/pixmaps/%ICONPREFIX-text.png=../icons/hicolor/48x48/mimetypes/text.png f none usr/share/pixmaps/%ICONPREFIX-text-template.png=../icons/hicolor/48x48/mimetypes/text-template.png f none usr/share/pixmaps/%ICONPREFIX-spreadsheet.png=../icons/hicolor/48x48/mimetypes/spreadsheet.png |