rpms/openoffice.org/devel openoffice.org.spec,1.1203,1.1204
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Tue Jun 12 13:43:31 UTC 2007
- Previous message (by thread): rpms/autofs/devel autofs-5.0.1-add-ldaps-support.patch,NONE,1.1
- Next message (by thread): rpms/xen/devel xen-console-log.patch, NONE, 1.1 xen-hvm-save-paths.patch, NONE, 1.1 xen-pvfb-no-hvm.patch, NONE, 1.1 xen.logrotate, NONE, 1.1 xen.modules, NONE, 1.1 xen.sysconfig, NONE, 1.1 xen-initscript.patch, 1.7, 1.8 xen.spec, 1.179, 1.180 xen-remove-vnc-monitor.patch, 1.1, NONE
- 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-serv6355
Modified Files:
openoffice.org.spec
Log Message:
link opt foo
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1203
retrieving revision 1.1204
diff -u -r1.1203 -r1.1204
--- openoffice.org.spec 8 Jun 2007 17:45:15 -0000 1.1203
+++ openoffice.org.spec 12 Jun 2007 13:42:56 -0000 1.1204
@@ -1158,8 +1158,10 @@
dmake
%endif
cd ../../util
-%if ! %{linkopt}
+%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
`( (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`
- Previous message (by thread): rpms/autofs/devel autofs-5.0.1-add-ldaps-support.patch,NONE,1.1
- Next message (by thread): rpms/xen/devel xen-console-log.patch, NONE, 1.1 xen-hvm-save-paths.patch, NONE, 1.1 xen-pvfb-no-hvm.patch, NONE, 1.1 xen.logrotate, NONE, 1.1 xen.modules, NONE, 1.1 xen.sysconfig, NONE, 1.1 xen-initscript.patch, 1.7, 1.8 xen.spec, 1.179, 1.180 xen-remove-vnc-monitor.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list