fix icon handling by re-adding the removed @exec lines, and also remove

the base desktop file because the startcenter one is basically the same
This commit is contained in:
robert 2012-04-10 13:34:13 +00:00
parent b1e75e3ee5
commit bca2772d76
2 changed files with 10 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.62 2012/04/05 07:44:14 robert Exp $
# $OpenBSD: Makefile,v 1.63 2012/04/10 13:34:13 robert Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -16,7 +16,7 @@ PKGNAME-kde= libreoffice-kde-${VERSION}
PKGNAME-java= libreoffice-java-${VERSION}
CATEGORIES= editors productivity
REVISION-main= 0
REVISION-main= 1
EPOCH= 0
MAINTAINER= Robert Nagy <robert@openbsd.org>
@ -346,7 +346,7 @@ post-install:
${PREFIX}/share/icons \
${PREFIX}/share/mime/packages
for _d in base calc draw impress math \
for _d in calc draw impress math \
qstart startcenter writer; do \
perl -pi -e "s,Icon=libreoffice3.5-,Icon=libreoffice-,g" \
${PREFIX}/lib/libreoffice/share/xdg/$${_d}.desktop && \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.21 2012/04/03 08:56:50 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.22 2012/04/10 13:34:13 robert Exp $
@conflict openoffice-*
@pkgpath editors/openoffice3,-main
%%SHARED%%
@ -2835,7 +2835,6 @@ lib/libreoffice/ure/share/java/
lib/libreoffice/ure/share/misc/
lib/libreoffice/ure/share/misc/services.rdb
lib/libreoffice/ure/share/misc/types.rdb
share/applications/base.desktop
share/applications/calc.desktop
share/applications/draw.desktop
share/applications/impress.desktop
@ -2978,3 +2977,9 @@ share/icons/hicolor/48x48/mimetypes/spreadsheet.png
share/icons/hicolor/48x48/mimetypes/text-template.png
share/icons/hicolor/48x48/mimetypes/text.png
share/mime/packages/openoffice.org.xml
@exec %D/bin/update-mime-database %D/share/mime
@unexec-delete %D/bin/update-mime-database %D/share/mime
@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database