rpms/openoffice.org/devel openoffice.org.spec,1.1314,1.1315
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Mon Oct 8 07:26:18 UTC 2007
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3606
Modified Files:
openoffice.org.spec
Log Message:
re-enable custom launchers
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1314
retrieving revision 1.1315
diff -u -r1.1314 -r1.1315
--- openoffice.org.spec 7 Oct 2007 11:49:16 -0000 1.1314
+++ openoffice.org.spec 8 Oct 2007 07:25:44 -0000 1.1315
@@ -1,6 +1,6 @@
%define oootag OOG680
%define ooomilestone 6
-%define rh_rpm_release 2
+%define rh_rpm_release 3
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -1167,27 +1167,26 @@
export GNOME_MIME_THEME=hicolor
./create_tree.sh
-#disable for now, breaks icedtea
-##start of jakub based suggestion on prelink optimization
-#cd ../../../../desktop/source/app
-#%if ! %{linkopt}
-#sed -i -e "s/OBJ/SLO/" makefile.mk
-#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
-#%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`
-#`( (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`
-#`( (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/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
-##end of jakub based suggestion on prelink optimization
+#start of jakub based suggestion on prelink optimization
+cd ../../../../desktop/source/app
+%if ! %{linkopt}
+sed -i -e "s/OBJ/SLO/" makefile.mk
+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
+%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`
+`( (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`
+`( (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/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
+#end of jakub based suggestion on prelink optimization
echo build end time is `date`, diskspace: `df -h . | tail -n 1`
%install
@@ -1207,15 +1206,14 @@
echo - ---dump log end---
dmake openoffice_en-US
fi
-#disable for now, breaks icedtea
-#%if ! %{linkopt}
-#cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
-#%endif
-#cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
-#cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
-#cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
-#cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
-#cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
+%if ! %{linkopt}
+cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
+%endif
+cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
+cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
+cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
+cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin
+cp -f ../../desktop/$OUTPATH.pro/bin/sdraw $RPM_BUILD_ROOT/%{instdir}/program/sdraw.bin
chmod -R +w $RPM_BUILD_ROOT/%{instdir}
%if %{langpacks}
dmake ooolanguagepack
@@ -1946,7 +1944,7 @@
%{instdir}/program/setofficelang*
%{instdir}/program/soffice
%{instdir}/program/soffice.bin
-#%{instdir}/program/libsoffice.so
+%{instdir}/program/libsoffice.so
%{instdir}/program/sofficerc
%{instdir}/program/spadmin
%{instdir}/program/spadmin.bin
@@ -2375,7 +2373,7 @@
%{instdir}/program/resource/date680en-US.res
%{instdir}/program/resource/sc680en-US.res
%{instdir}/program/scalc
-#%{instdir}/program/scalc.bin
+%{instdir}/program/scalc.bin
%dir %{instdir}/share
%dir %{instdir}/share/registry
%dir %{instdir}/share/registry/data
@@ -2428,7 +2426,7 @@
%{instdir}/help/en/sdraw.*
%dir %{instdir}/program
%{instdir}/program/sdraw
-#%{instdir}/program/sdraw.bin
+%{instdir}/program/sdraw.bin
%dir %{instdir}/share
%dir %{instdir}/share/registry
%dir %{instdir}/share/registry/data
@@ -2495,7 +2493,7 @@
%{instdir}/program/libswui680*.so
%{instdir}/program/libwpft680*.so
%{instdir}/program/swriter
-#%{instdir}/program/swriter.bin
+%{instdir}/program/swriter.bin
%dir %{instdir}/program/classes
%{instdir}/program/classes/writer2latex.jar
%dir %{instdir}/share
@@ -2564,7 +2562,7 @@
%{instdir}/program/libanimcore.so
%{instdir}/program/libplaceware*.so
%{instdir}/program/simpress
-#%{instdir}/program/simpress.bin
+%{instdir}/program/simpress.bin
%dir %{instdir}/share
%dir %{instdir}/share/config
%{instdir}/share/config/soffice.cfg
@@ -2778,6 +2776,9 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Mon Oct 08 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.3
+- reenable prelink-optimized launchers
+
* Sun Oct 07 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.2
- reenable visibility again now that guard visibility is sane again
More information about the fedora-extras-commits
mailing list