rpms/openoffice.org/devel openoffice.org-multiliblauncher.sh, 1.1, 1.1.2.1 openoffice.org.spec, 1.1440.2.29, 1.1440.2.30
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Mar 24 16:12:25 UTC 2008
- Previous message (by thread): rpms/vdr/devel MainMenuHooks-v1_0.patch, NONE, 1.1.2.1 timercmd-0.1_1.5.12.diff, NONE, 1.1.2.1 vdr-1.5.17-progressbar-support-0.0.1.diff, NONE, 1.1.2.1 vdr-1.5.18-hlcutter-0.2.0.diff, NONE, 1.1.2.1 vdr-1.5.18-syncearly.patch, NONE, 1.1.2.1 vdr-1.5.18-use-pkgconfig.patch, NONE, 1.1.2.1 vdr-1.6.0-man-section.patch, NONE, 1.1.2.1 vdr-1.6.0-paths.patch, NONE, 1.1.2.1 vdr-1.6.0-scriptnames.patch, NONE, 1.1.2.1 .cvsignore, 1.13, 1.13.2.1 sources, 1.13, 1.13.2.1 vdr.init, 1.7, 1.7.2.1 vdr.spec, 1.23, 1.23.2.1 vdr.sysconfig, 1.5, 1.5.2.1 vdr-1.4.1-dumpable.patch, 1.1, NONE vdr-1.4.6-1-syncearly.patch, 1.1, NONE vdr-1.4.6-paths.patch, 1.1, NONE vdr-1.4.7-gcc43.patch, 1.1, NONE vdr-1.4.7-hlcutter-0.2.0.diff, 1.1, NONE vdr-1.4.7-recmenu-play.patch, 1.1, NONE vdr-1.4.7-syncearly-syslog.patch, 1.1, NONE
- Next message (by thread): rpms/compiz/devel .cvsignore, 1.33, 1.34 compiz.spec, 1.116, 1.117 sources, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15514
Modified Files:
Tag: openoffice_org-2_4_0-9_1_999_fc9
openoffice.org-multiliblauncher.sh openoffice.org.spec
Log Message:
libsoffice partially integrated
Index: openoffice.org-multiliblauncher.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-multiliblauncher.sh,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org-multiliblauncher.sh 13 Feb 2008 13:47:43 -0000 1.1
+++ openoffice.org-multiliblauncher.sh 24 Mar 2008 16:11:39 -0000 1.1.2.1
@@ -1,7 +1,7 @@
#!/bin/sh
OOO_ARCH=$(uname -m)
case $OOO_ARCH in
- x86_64 | ia64 | s390 )
+ x86_64 | ia64 | s390x )
OOO_LIB_DIR="/usr/lib64"
SECONDARY_LIB_DIR="/usr/lib"
;;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.29
retrieving revision 1.1440.2.30
diff -u -r1.1440.2.29 -r1.1440.2.30
--- openoffice.org.spec 22 Mar 2008 17:26:12 -0000 1.1440.2.29
+++ openoffice.org.spec 24 Mar 2008 16:11:39 -0000 1.1440.2.30
@@ -1186,16 +1186,7 @@
./create_tree.sh
#start of jakub based suggestion on prelink optimization
-cd ../../../../desktop/source/app
-sed -i -e "s/OBJ/SLO/" makefile.mk
-dmake
-cd ../../util
-%if %{stlport_abi_lockin}
-`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
-%else
-`(cat ../$OUTPATH.pro/misc/soffice.soffice_5.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | grep -v stlport | xargs | xargs`
-%endif
-$LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
+cd ../../../../desktop/util
`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
@@ -2916,7 +2907,7 @@
%{python_py_sitearch}/unohelper.py*
%changelog
-* Sat Mar 22 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.4.1
+* Mon Mar 24 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.4.1
- extend selinux bodge to ia64
- drop integrated workspace.notes2.patch
- drop integrated openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
@@ -2929,6 +2920,7 @@
- drop openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
- drop integrated openoffice.org-1.9.114.rh161886.rpath.desktop.patch
- drop integrated openoffice.org-2.3.1.ooo81307.sw.word2.patch
+- libsoffice partially integrated into head
- add workspace.cmcfixes43.patch
- add the report-builder
- Previous message (by thread): rpms/vdr/devel MainMenuHooks-v1_0.patch, NONE, 1.1.2.1 timercmd-0.1_1.5.12.diff, NONE, 1.1.2.1 vdr-1.5.17-progressbar-support-0.0.1.diff, NONE, 1.1.2.1 vdr-1.5.18-hlcutter-0.2.0.diff, NONE, 1.1.2.1 vdr-1.5.18-syncearly.patch, NONE, 1.1.2.1 vdr-1.5.18-use-pkgconfig.patch, NONE, 1.1.2.1 vdr-1.6.0-man-section.patch, NONE, 1.1.2.1 vdr-1.6.0-paths.patch, NONE, 1.1.2.1 vdr-1.6.0-scriptnames.patch, NONE, 1.1.2.1 .cvsignore, 1.13, 1.13.2.1 sources, 1.13, 1.13.2.1 vdr.init, 1.7, 1.7.2.1 vdr.spec, 1.23, 1.23.2.1 vdr.sysconfig, 1.5, 1.5.2.1 vdr-1.4.1-dumpable.patch, 1.1, NONE vdr-1.4.6-1-syncearly.patch, 1.1, NONE vdr-1.4.6-paths.patch, 1.1, NONE vdr-1.4.7-gcc43.patch, 1.1, NONE vdr-1.4.7-hlcutter-0.2.0.diff, 1.1, NONE vdr-1.4.7-recmenu-play.patch, 1.1, NONE vdr-1.4.7-syncearly-syslog.patch, 1.1, NONE
- Next message (by thread): rpms/compiz/devel .cvsignore, 1.33, 1.34 compiz.spec, 1.116, 1.117 sources, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list