rpms/openoffice.org/devel openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch, 1.5, 1.6 openoffice.org.spec, 1.1303, 1.1304

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7172

Modified Files:
	openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch 
	openoffice.org.spec 
Log Message:
scale back on visibility

openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch:

Index: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	2 Dec 2006 11:40:26 -0000	1.5
+++ openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch	6 Sep 2007 19:26:41 -0000	1.6
@@ -9,22 +9,22 @@
      case ${sd_arg} in
      -calc)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-calc"
-+	sd_binary="scalc.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      -draw)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-draw"
-+	sd_binary="sdraw.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      -impress)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-impress"
-+	sd_binary="simpress.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      -writer)
 -        sd_pagein_args="${sd_pagein_args:+${sd_pagein_args} }@pagein-writer"
-+	sd_binary="swriter.bin"
++	sd_binary="soffice.bin"
          break;
          ;;
      *)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1303
retrieving revision 1.1304
diff -u -r1.1303 -r1.1304
--- openoffice.org.spec	6 Sep 2007 17:45:42 -0000	1.1303
+++ openoffice.org.spec	6 Sep 2007 19:26:41 -0000	1.1304
@@ -1100,6 +1100,9 @@
 cd ..
 ./bootstrap
 source Linux*Env.Set.sh
+#visibility seem to be f*cked up right now
+unset HAVE_GCC_VISIBILITY_FEATURE
+#unneccessary to build for both hash types
 unset HAVE_LD_HASH_STYLE
 #faster build
 export nodep=true
@@ -2782,6 +2785,7 @@
 - add openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
 - disable custom launchers, it breaks icedtea for some reason I haven't time to
   figure out
+- disable visibility for now, seems screwed up.
 
 * Tue Sep 04 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-3.2
 - rebuild against icu