Fix printeradmin desktop-file, see bug #173715

Package-Manager: portage-2.1.2.4

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index a7ffc39fa2810a212d46945a305c428ed4899351..43112ba87a160b604a5e38923b8423821c8a630c 100644 (file)
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.162 2007/04/06 22:25:06 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.163 2007/04/25 17:40:08 suka Exp $
+
+  25 Apr 2007; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-2.2.0.ebuild:
+  Fix printeradmin desktop-file, see bug #173715
 
   06 Apr 2007; Andreas Proschofsky <suka@gentoo.org>
   -files/2.1.0/50-openoffice-bin, -files/2.1.0/ooo-wrapper2,

diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index fbae5da24e2766970cab8aa56369a22d489334f9..27807c8f7d73793a9aaf40554101a19d347f3afc 100644 (file)
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -81,14 +81,14 @@ DIST OOo_2.2.0rc4_20070321_LinuxIntel_langpack_xh.tar.gz 13595561 RMD160 80ae386
 DIST OOo_2.2.0rc4_20070321_LinuxIntel_langpack_zh-CN.tar.gz 14435109 RMD160 0032e5231b3c040f32664a288c0dc2b8c75adbed SHA1 99d9a69b34772e8bb4ae59646b80c0b26fc4ce72 SHA256 7ec884eafed7ac476ebf8dd6b55721b9f2dcbb2e664bb17c1d446d9c5081f257
 DIST OOo_2.2.0rc4_20070321_LinuxIntel_langpack_zh-TW.tar.gz 14575390 RMD160 f209b1a82d339313cb5ec01a166253869d107409 SHA1 2d0f122ff976b292daf8ce51a7c14586c73ea7f7 SHA256 713da8058295f1ee4ac4b7588520bce3f5247395e354d63189f1c23d101b703b
 DIST OOo_2.2.0rc4_20070321_LinuxIntel_langpack_zu.tar.gz 13580798 RMD160 a790fedff15252f68220248905cda3723cd4c6c9 SHA1 48ea58e174f82b6218e4e7e5c4a64f502988b402 SHA256 a68301fa9c876e4fe4eee2345663c971fa27685816fd544d3beea968fc399a6a
-EBUILD openoffice-bin-2.2.0.ebuild 5543 RMD160 ca29ca3fb22f1b6f5cc537ae6635c17b3406a719 SHA1 3478a02a72aa150cb42398fc8c7af9a6285b773b SHA256 11ef8f565325d9df6d62752bd3a81e79373c9a3840e2dbac6087bcf3fafcc999
-MD5 ed8dd431f726325c81bbaced669abe04 openoffice-bin-2.2.0.ebuild 5543
-RMD160 ca29ca3fb22f1b6f5cc537ae6635c17b3406a719 openoffice-bin-2.2.0.ebuild 5543
-SHA256 11ef8f565325d9df6d62752bd3a81e79373c9a3840e2dbac6087bcf3fafcc999 openoffice-bin-2.2.0.ebuild 5543
-MISC ChangeLog 30313 RMD160 9038cfa825852ffe9101b4251db79c542a1b9ae2 SHA1 9662579b3ef1f3de760c8b6f2c4b091da2f0dbb3 SHA256 69630a457f2ffaa300ac3bae76b8d288fe81379529a1fc6ca101f9dd857d1ed9
-MD5 2ee19de6b8fbed2a993c74522b27865a ChangeLog 30313
-RMD160 9038cfa825852ffe9101b4251db79c542a1b9ae2 ChangeLog 30313
-SHA256 69630a457f2ffaa300ac3bae76b8d288fe81379529a1fc6ca101f9dd857d1ed9 ChangeLog 30313
+EBUILD openoffice-bin-2.2.0.ebuild 5456 RMD160 682b1626ddf04975d57dc6412ef7fbf594a66a11 SHA1 7f3c0a159851a781e50f73a5326f2b1a99f38073 SHA256 edf3d560a58989425920ba17c604dd25e740e6cfe7261c47e17f942a5959aa7e
+MD5 6777be5037139bb194648f7ccd9760e3 openoffice-bin-2.2.0.ebuild 5456
+RMD160 682b1626ddf04975d57dc6412ef7fbf594a66a11 openoffice-bin-2.2.0.ebuild 5456
+SHA256 edf3d560a58989425920ba17c604dd25e740e6cfe7261c47e17f942a5959aa7e openoffice-bin-2.2.0.ebuild 5456
+MISC ChangeLog 30447 RMD160 ba3769a61df03ee7af03cc1922aa95bcc028b9dd SHA1 2747c59bacc53bb664e4fff500eddf74041706b9 SHA256 70385a475bd1cd4210174f58bc1ba44de82c8cdaa6280b10acf36b4d552121c7
+MD5 326e8358822ac46fb54cd190f79159bc ChangeLog 30447
+RMD160 ba3769a61df03ee7af03cc1922aa95bcc028b9dd ChangeLog 30447
+SHA256 70385a475bd1cd4210174f58bc1ba44de82c8cdaa6280b10acf36b4d552121c7 ChangeLog 30447
 MISC metadata.xml 460 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 SHA1 09559b952ad283bf009bb78cca9bc125c644a977 SHA256 9160d9de32e063130943805fe72d9bb196700524a54a54cf1769a740ecd9183d
 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460
 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 metadata.xml 460

diff --git a/app-office/openoffice-bin/openoffice-bin-2.2.0.ebuild b/app-office/openoffice-bin/openoffice-bin-2.2.0.ebuild
index ba566ac196a6d74cc39e700013b40797b61f11e3..a862a36220c4cc216e915a06bd706748fa64993f 100644 (file)
--- a/app-office/openoffice-bin/openoffice-bin-2.2.0.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.2.0.ebuild,v 1.4 2007/04/06 19:27:46 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.2.0.ebuild,v 1.5 2007/04/25 17:40:08 suka Exp $
 
 inherit eutils fdo-mime rpm multilib
 
@@ -95,7 +95,6 @@ src_install () {
 
        #Menu entries, icons and mime-types
        cd ${D}${INSTDIR}/share/xdg/
-       sed -i -e s/'Exec=openoffice.org-2.2-printeradmin'/'Exec=oopadmin2'/g printeradmin.desktop || die
 
        for desk in base calc draw impress math printeradmin writer; do
                mv ${desk}.desktop openoffice.org-2.2-${desk}.desktop
@@ -119,7 +118,7 @@ src_install () {
                dosym ooffice /usr/bin/oo${app}
        done
 
-       dosym ${INSTDIR}/program/spadmin.bin /usr/bin/oopadmin
+       dosym ${INSTDIR}/program/spadmin.bin /usr/bin/ooffice-printeradmin
 
        # Change user install dir
        sed -i -e s/.openoffice.org2/.ooo-2.0/g ${D}${INSTDIR}/program/bootstraprc || die