rpms/openoffice.org/devel workspace.ppc64one.patch,1.2,1.3

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Wed Jun 6 08:27:50 UTC 2007


Author: caolanm

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

Modified Files:
	workspace.ppc64one.patch 
Log Message:
remove configure part of patch

workspace.ppc64one.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 workspace.ppc64one.patch
Index: workspace.ppc64one.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.ppc64one.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.ppc64one.patch	6 Jun 2007 08:18:46 -0000	1.2
+++ workspace.ppc64one.patch	6 Jun 2007 08:27:18 -0000	1.3
@@ -1,28747 +1,3 @@
-Index: tools/config_office/configure
-diff -u tools/config_office/configure:1.186 tools/config_office/configure:1.186.4.1
---- tools/config_office/configure:1.186	Fri May 11 03:23:58 2007
-+++ tools/config_office/configure	Tue May 29 07:16:00 2007
-@@ -1,37 +1,101 @@
- #! /bin/sh
--# From configure.in Revision: 1.204  .
-+# From configure.in Revision .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.57.
-+# Generated by GNU Autoconf 2.61.
- #
--# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
--# Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-   # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-   # is contrary to our usage.  Disable this feature.
-   alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
--  set -o posix
-+  setopt NO_GLOB_SUBST
-+else
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
-+fi
-+
-+
-+
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  echo "#! /bin/sh" >conf$$.sh
-+  echo  "exit 0"   >>conf$$.sh
-+  chmod +x conf$$.sh
-+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+    PATH_SEPARATOR=';'
-+  else
-+    PATH_SEPARATOR=:
-+  fi
-+  rm -f conf$$.sh
- fi
- 
- # Support unset when possible.
--if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
- fi
- 
- 
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
-+case $0 in
-+  *[\\/]* ) as_myself=$0 ;;
-+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+  { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -42,21 +106,22 @@
-   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-   LC_TELEPHONE LC_TIME
- do
--  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
--    $as_unset $as_var
-+    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-   fi
- done
- 
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
- else
-   as_expr=false
- fi
- 
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-   as_basename=basename
- else
-   as_basename=false
-@@ -64,206 +129,447 @@
- 
- 
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)$' \| \
--	 .     : '\(.\)' 2>/dev/null ||
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
--  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
--  	  /^X\/\(\/\).*/{ s//\1/; q; }
--  	  s/.*/./; q'`
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
-+# CDPATH.
-+$as_unset CDPATH
- 
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
--  echo "#! /bin/sh" >conf$$.sh
--  echo  "exit 0"   >>conf$$.sh
--  chmod +x conf$$.sh
--  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
--    PATH_SEPARATOR=';'
--  else
[...28419 lines suppressed...]
--  if test x"$ac_file" = x-; then
--    configure_input=
--  else
--    configure_input="$ac_file.  "
--  fi
--  configure_input=$configure_input"Generated from `echo $ac_file_in |
--                                     sed 's,.*/,,'` by configure."
--
--  # First look for the input files in the build tree, otherwise in the
--  # src tree.
--  ac_file_inputs=`IFS=:
--    for f in $ac_file_in; do
--      case $f in
--      -) echo $tmp/stdin ;;
--      [\\/$]*)
--         # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--         echo $f;;
--      *) # Relative
--         if test -f "$f"; then
--           # Build tree
--           echo $f
--         elif test -f "$srcdir/$f"; then
--           # Source tree
--           echo $srcdir/$f
--         else
--           # /dev/null tree
--           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
--   { (exit 1); exit 1; }; }
--         fi;;
--      esac
--    done` || { (exit 1); exit 1; }
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-+
-+case `sed -n '/datarootdir/ {
-+  p
-+  q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
-+    s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
-+_ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF
-   sed "$ac_vpsub
- $extrasub
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s, at configure_input@,$configure_input,;t t
--s, at srcdir@,$ac_srcdir,;t t
--s, at abs_srcdir@,$ac_abs_srcdir,;t t
--s, at top_srcdir@,$ac_top_srcdir,;t t
--s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s, at builddir@,$ac_builddir,;t t
--s, at abs_builddir@,$ac_abs_builddir,;t t
--s, at top_builddir@,$ac_top_builddir,;t t
--s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
--  rm -f $tmp/stdin
--  if test x"$ac_file" != x-; then
--    mv $tmp/out $ac_file
--  else
--    cat $tmp/out
--    rm -f $tmp/out
--  fi
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" | sed -f "$tmp/subs-4.sed" >$tmp/out
-+
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&5
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined.  Please make sure it is defined." >&2;}
- 
--done
--_ACEOF
-+  rm -f "$tmp/stdin"
-+  case $ac_file in
-+  -) cat "$tmp/out"; rm -f "$tmp/out";;
-+  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-+  esac
-+ ;;
-+
-+
-+
-+  esac
-+
-+done # for ac_tag
- 
--cat >>$CONFIG_STATUS <<\_ACEOF
- 
- { (exit 0); exit 0; }
- _ACEOF
 Index: tools/config_office/configure.in
 diff -u tools/config_office/configure.in:1.204 tools/config_office/configure.in:1.204.4.1
 --- tools/config_office/configure.in:1.204	Thu May 10 09:40:23 2007
@@ -28897,7 +153,7 @@
  # don't change - required to work around optimization bugs
 Index: tools/solenv/inc/unxlngppc64.mk
 diff -u /dev/null tools/solenv/inc/unxlngppc64.mk:1.1.2.2
---- /dev/null	Wed Jun  6 01:12:03 2007
+--- /dev/null	Wed Jun  6 01:25:02 2007
 +++ tools/solenv/inc/unxlngppc64.mk	Fri Jun  1 05:05:04 2007
 @@ -0,0 +1,40 @@
 +#*************************************************************************
@@ -28981,7 +237,7 @@
  CFLAGS += -DLEAK_STATIC_DATA
 Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/call.s
 diff -u /dev/null udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/call.s:1.1.2.2
---- /dev/null	Wed Jun  6 01:12:19 2007
+--- /dev/null	Wed Jun  6 01:25:18 2007
 +++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/call.s	Tue Jun  5 05:09:50 2007
 @@ -0,0 +1,110 @@
 +# http://www.ibm.com/developerworks/linux/library/l-powasm1.html
@@ -29096,7 +352,7 @@
 +	.section	.note.GNU-stack,"", at progbits
 Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
 diff -u /dev/null udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx:1.1.2.2
---- /dev/null	Wed Jun  6 01:12:19 2007
+--- /dev/null	Wed Jun  6 01:25:18 2007
 +++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx	Tue Jun  5 05:09:50 2007
 @@ -0,0 +1,729 @@
 +/*************************************************************************
@@ -29830,7 +1086,7 @@
 +
 Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx
 diff -u /dev/null udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx:1.1.2.1
---- /dev/null	Wed Jun  6 01:12:19 2007
+--- /dev/null	Wed Jun  6 01:25:18 2007
 +++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx	Tue May 29 08:18:29 2007
 @@ -0,0 +1,294 @@
 +/*************************************************************************
@@ -30129,7 +1385,7 @@
 +
 Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
 diff -u /dev/null udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk:1.1.2.2
---- /dev/null	Wed Jun  6 01:12:19 2007
+--- /dev/null	Wed Jun  6 01:25:18 2007
 +++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk	Tue Jun  5 05:09:50 2007
 @@ -0,0 +1,93 @@
 +#*************************************************************************
@@ -30227,7 +1483,7 @@
 +    touch $@
 Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
 diff -u /dev/null udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx:1.1.2.1
---- /dev/null	Wed Jun  6 01:12:19 2007
+--- /dev/null	Wed Jun  6 01:25:18 2007
 +++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx	Tue May 29 08:19:15 2007
 @@ -0,0 +1,99 @@
 +/*************************************************************************
@@ -30331,7 +1587,7 @@
 +}
 Index: udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
 diff -u /dev/null udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx:1.1.2.2
---- /dev/null	Wed Jun  6 01:12:19 2007
+--- /dev/null	Wed Jun  6 01:25:18 2007
 +++ udk/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx	Tue Jun  5 05:09:50 2007
 @@ -0,0 +1,582 @@
 +/*************************************************************************




More information about the scm-commits mailing list