/[gentoo-x86]/app-office/libreoffice/files/fix-ooo-collision.diff
Gentoo

Contents of /app-office/libreoffice/files/fix-ooo-collision.diff

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Sun Mar 18 09:11:12 2012 UTC (2 years, 3 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
File MIME type: text/plain
FILE REMOVED
Add gb_FULLDEPS patch. Clear up other patches.

(Portage version: 2.2.0_alpha90/cvs/Linux x86_64)

1 --- bin/package-ooo.orig 2010-11-29 20:16:08.700004578 +0100
2 +++ bin/package-ooo 2010-11-29 20:20:47.972004579 +0100
3 @@ -104,12 +104,12 @@
4 ln -sf $OOINSTBASE/program/soffice$BINSUFFIX $PREFIX/bin/soffice$BINSUFFIX
5
6 # no man-page so ...
7 -if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva"; then
8 +if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva" -a "z$VENDORNAME" != "zGentoo"; then
9 install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig
10 install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
11 fi
12
13 -if test "z$VENDORNAME" = "zMandriva"; then
14 +if test "z$VENDORNAME" = "zMandriva" -o "z$VENDORNAME" = "zGentoo"; then
15 install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig$BINSUFFIX
16 install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
17 fi
18 @@ -210,9 +210,9 @@
19 done
20
21 # shared MIME info
22 - mkdir -p $PREFIX/share/mime/packages
23 + mkdir -p $DATADIR/mime/packages
24 cd $TOOLSDIR/desktop
25 - cp openoffice.xml $PREFIX/share/mime/packages
26 + cp openoffice.xml $DATADIR/mime/packages/libreoffice.xml
27 if test "z$RUN_POST_INSTALL_SCRIPTS" = "zyes" &&
28 which update-mime-database >/dev/null 2>&1 ; then
29 update-mime-database /usr/share/mime || :

  ViewVC Help
Powered by ViewVC 1.1.20