| 1 |
suka 11/02/05 10:40:31 |
| 2 |
|
| 3 |
Added: ooo-build-3.0.1.2-prefix.patch |
| 4 |
Log: |
| 5 |
EAPI3 and prefix fixes, bug #353035, also clean up pax-stuff, bug #353587 |
| 6 |
|
| 7 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-office/openoffice/files/ooo-build-3.0.1.2-prefix.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/files/ooo-build-3.0.1.2-prefix.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/openoffice/files/ooo-build-3.0.1.2-prefix.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: ooo-build-3.0.1.2-prefix.patch |
| 16 |
=================================================================== |
| 17 |
--- ooo-build-3.0.1.2/bin/package-ooo.orig 2008-10-07 08:50:49.000000000 -0500 |
| 18 |
+++ ooo-build-3.0.1.2/bin/package-ooo 2008-11-11 14:47:21.000000000 -0600 |
| 19 |
@@ -115,8 +115,8 @@ |
| 20 |
fi |
| 21 |
|
| 22 |
# create bash completion |
| 23 |
-mkdir -p $OODESTDIR/etc/bash_completion.d |
| 24 |
-$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh |
| 25 |
+mkdir -p $SYSCONFDIR/bash_completion.d |
| 26 |
+$TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $SYSCONFDIR/bash_completion.d/ooffice${BINSUFFIX}.sh |
| 27 |
|
| 28 |
if test "z$VENDORNAME" != "zRedHat"; then |
| 29 |
mkdir -p $MANDIR/man1 |
| 30 |
@@ -176,11 +176,11 @@ |
| 31 |
# Icons and menu stuff is handled in actions.py |
| 32 |
;; |
| 33 |
*) |
| 34 |
- mkdir -p $OODESTDIR/usr/share/applications |
| 35 |
+ mkdir -p $DATADIR/applications |
| 36 |
cd $TOOLSDIR/desktop |
| 37 |
for source in *.desktop ; do |
| 38 |
dest=`echo $source | sed "s|.desktop\$||"` |
| 39 |
- dest="$OODESTDIR/usr/share/applications/$dest$BINSUFFIX.desktop" |
| 40 |
+ dest="$DATADIR/applications/$dest$BINSUFFIX.desktop" |
| 41 |
add_version= |
| 42 |
test "z$VENDORNAME" = "zNovell" -a "z$BINSUFFIX" != "z" && add_version=" ($VERSION)" || : |
| 43 |
sed -e "s|\(^Name.*\)\$|\1$add_version| |
| 44 |
@@ -188,7 +188,7 @@ |
| 45 |
done |
| 46 |
|
| 47 |
# icons |
| 48 |
- icondir=/usr/share/icons/hicolor |
| 49 |
+ icondir=$DATADIRBASE/icons/hicolor |
| 50 |
for size in 16x16 22x22 24x24 32x32 48x48 scalable ; do |
| 51 |
mkdir -p $OODESTDIR/$icondir/$size/apps |
| 52 |
cd $TOOLSDIR/desktop/$size/ |
| 53 |
@@ -210,9 +210,9 @@ |
| 54 |
done |
| 55 |
|
| 56 |
# shared MIME info |
| 57 |
- mkdir -p $OODESTDIR/usr/share/mime/packages |
| 58 |
+ mkdir -p $DATADIR/mime/packages |
| 59 |
cd $TOOLSDIR/desktop |
| 60 |
- cp openoffice.xml $OODESTDIR/usr/share/mime/packages |
| 61 |
+ cp openoffice.xml $DATADIR/mime/packages |
| 62 |
if test "z$RUN_POST_INSTALL_SCRIPTS" = "zyes" && |
| 63 |
which update-mime-database >/dev/null 2>&1 ; then |
| 64 |
update-mime-database /usr/share/mime || : |
Archives