fedora-cvs-commits@redhat.com
[Top] [All Lists]

rpms/control-center/devel control-center-2.11.6-xft.patch, 1.1, 1.2 cont

Subject: rpms/control-center/devel control-center-2.11.6-xft.patch, 1.1, 1.2 control-center.spec, 1.78, 1.79
From:
Date: Wed, 3 Aug 2005 11:38:35 -0400
Author: mclasen

Update of /cvs/dist/rpms/control-center/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4034

Modified Files:
        control-center-2.11.6-xft.patch control-center.spec 
Log Message:
Fix patches


control-center-2.11.6-xft.patch:
 configure    |   18 +++++++++---------
 configure.in |    2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 control-center-2.11.6-xft.patch
Index: control-center-2.11.6-xft.patch
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center-2.11.6-xft.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- control-center-2.11.6-xft.patch     15 Jul 2005 20:06:59 -0000      1.1
+++ control-center-2.11.6-xft.patch     3 Aug 2005 15:38:31 -0000       1.2
@@ -1,6 +1,6 @@
---- control-center-2.11.6/configure.in.xft     2005-07-15 16:03:24.000000000 
-0400
-+++ control-center-2.11.6/configure.in 2005-07-15 16:03:51.000000000 -0400
-@@ -19,7 +19,7 @@
+--- control-center-2.11.90/configure.in.xft    2005-08-03 11:33:48.000000000 
-0400
++++ control-center-2.11.90/configure.in        2005-08-03 11:34:06.000000000 
-0400
+@@ -23,7 +23,7 @@
  
  m4_define(gnomevfs_minver, 2.0.0)
  m4_define(fontconfig_minver, 1.0.0)
@@ -9,5698 +9,9 @@
  m4_define(gtk_minver, 2.6.0)
  m4_define(libbonobo_minver, 2.0.0)
  m4_define(libgnomeui_minver, 2.2.0)
---- control-center-2.11.6/configure.xft        2005-07-15 16:04:09.000000000 
-0400
-+++ control-center-2.11.6/configure    2005-07-15 16:04:19.000000000 -0400
-@@ -1,10 +1,11 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59 for control-center 2.11.6.
-+# Generated by GNU Autoconf 2.57 for control-center 2.11.6.
- #
- # Report bugs to 
<http://bugzilla.gnome.org/enter_bug.cgi?product=control-center>.
- #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -21,10 +22,9 @@
- elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-   set -o posix
- fi
--DUALCASE=1; export DUALCASE # for MKS sh
- 
- # Support unset when possible.
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
-   as_unset=unset
- else
-   as_unset=false
-@@ -43,7 +43,7 @@
-   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-   LC_TELEPHONE LC_TIME
- do
--  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-+  if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
-     eval $as_var=C; export $as_var
-   else
-     $as_unset $as_var
-@@ -220,17 +220,16 @@
- if mkdir -p . 2>/dev/null; then
-   as_mkdir_p=:
- else
--  test -d ./-p && rmdir ./-p
-   as_mkdir_p=false
- fi
- 
- as_executable_p="test -f"
- 
- # Sed expression to map a string onto a valid CPP name.
--as_tr_cpp="eval sed 
'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
- 
- # Sed expression to map a string onto a valid variable name.
--as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
- 
- 
- # IFS
-@@ -824,7 +823,7 @@
- 
- # Be sure to have absolute paths.
- for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
--            localstatedir libdir includedir oldincludedir infodir mandir
-+              localstatedir libdir includedir oldincludedir infodir mandir
- do
-   eval ac_val=$`echo $ac_var`
-   case $ac_val in
-@@ -864,10 +863,10 @@
-   # Try the directory containing this script, then its parent.
-   ac_confdir=`(dirname "$0") 2>/dev/null ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--       X"$0" : 'X\(//\)[^/]' \| \
--       X"$0" : 'X\(//\)$' \| \
--       X"$0" : 'X\(/\)' \| \
--       .     : '\(.\)' 2>/dev/null ||
-+         X"$0" : 'X\(//\)[^/]' \| \
-+         X"$0" : 'X\(//\)$' \| \
-+         X"$0" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
- echo X"$0" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -1183,9 +1182,9 @@
-   cat <<_ACEOF
- Installation directories:
-   --prefix=PREFIX         install architecture-independent files in PREFIX
--                        [$ac_default_prefix]
-+                          [$ac_default_prefix]
-   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
--                        [PREFIX]
-+                          [PREFIX]
- 
- By default, \`make install' will install all the files in
- \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-@@ -1416,45 +1415,12 @@
-     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-     ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
--esac
-+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-+# absolute.
-+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
- 
-     cd $ac_dir
-     # Check for guested configure; otherwise get Cygnus style configure.
-@@ -1465,13 +1431,13 @@
-       echo
-       $SHELL $ac_srcdir/configure  --help=recursive
-     elif test -f $ac_srcdir/configure.ac ||
--         test -f $ac_srcdir/configure.in; then
-+           test -f $ac_srcdir/configure.in; then
-       echo
-       $ac_configure --help
-     else
-       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-     fi
--    cd "$ac_popdir"
-+    cd $ac_popdir
-   done
- fi
- 
-@@ -1479,9 +1445,10 @@
- if $ac_init_version; then
-   cat <<\_ACEOF
- control-center configure 2.11.6
--generated by GNU Autoconf 2.59
-+generated by GNU Autoconf 2.57
- 
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-+Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-@@ -1493,7 +1460,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by control-center $as_me 2.11.6, which was
[...6027 lines suppressed...]
-   # Work around the forget-to-reset-the-flag bug.
-   echo 't clr' >>$CONFIG_STATUS
-   echo ': clr' >>$CONFIG_STATUS
-@@ -29043,7 +27954,7 @@
-   # Write a limited-size here document to $tmp/undefs.sed.
-   echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-   # Speed up: don't consider the non `#undef'
--  echo '/^[    ]*#[    ]*undef/!b' >>$CONFIG_STATUS
-+  echo '/^[   ]*#[    ]*undef/!b' >>$CONFIG_STATUS
-   # Work around the forget-to-reset-the-flag bug.
-   echo 't clr' >>$CONFIG_STATUS
-   echo ': clr' >>$CONFIG_STATUS
-@@ -29077,10 +27988,10 @@
-     else
-       ac_dir=`(dirname "$ac_file") 2>/dev/null ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--       X"$ac_file" : 'X\(//\)[^/]' \| \
--       X"$ac_file" : 'X\(//\)$' \| \
--       X"$ac_file" : 'X\(/\)' \| \
--       .     : '\(.\)' 2>/dev/null ||
-+         X"$ac_file" : 'X\(//\)[^/]' \| \
-+         X"$ac_file" : 'X\(//\)$' \| \
-+         X"$ac_file" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
- echo X"$ac_file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -29096,10 +28007,10 @@
-       as_dirs="$as_dir $as_dirs"
-       as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--       X"$as_dir" : 'X\(//\)[^/]' \| \
--       X"$as_dir" : 'X\(//\)$' \| \
--       X"$as_dir" : 'X\(/\)' \| \
--       .     : '\(.\)' 2>/dev/null ||
-+         X"$as_dir" : 'X\(//\)[^/]' \| \
-+         X"$as_dir" : 'X\(//\)$' \| \
-+         X"$as_dir" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -29131,10 +28042,10 @@
- done
- echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
- $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--       X$ac_file : 'X\(//\)[^/]' \| \
--       X$ac_file : 'X\(//\)$' \| \
--       X$ac_file : 'X\(/\)' \| \
--       .     : '\(.\)' 2>/dev/null ||
-+         X$ac_file : 'X\(//\)[^/]' \| \
-+         X$ac_file : 'X\(//\)$' \| \
-+         X$ac_file : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
- echo X$ac_file |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -29153,41 +28064,16 @@
-   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
- $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--       X"$ac_dest" : 'X\(//\)[^/]' \| \
--       X"$ac_dest" : 'X\(//\)$' \| \
--       X"$ac_dest" : 'X\(/\)' \| \
--       .     : '\(.\)' 2>/dev/null ||
-+         X"$ac_dest" : 'X\(//\)[^/]' \| \
-+         X"$ac_dest" : 'X\(//\)$' \| \
-+         X"$ac_dest" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
- echo X"$ac_dest" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-         /^X\(\/\/\)$/{ s//\1/; q; }
-         /^X\(\/\).*/{ s//\1/; q; }
-         s/.*/./; q'`
--  { if $as_mkdir_p; then
--    mkdir -p "$ac_dir"
--  else
--    as_dir="$ac_dir"
--    as_dirs=
--    while test ! -d "$as_dir"; do
--      as_dirs="$as_dir $as_dirs"
--      as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--       X"$as_dir" : 'X\(//\)[^/]' \| \
--       X"$as_dir" : 'X\(//\)$' \| \
--       X"$as_dir" : 'X\(/\)' \| \
--       .     : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
--        /^X\(\/\/\)[^/].*/{ s//\1/; q; }
--        /^X\(\/\/\)$/{ s//\1/; q; }
--        /^X\(\/\).*/{ s//\1/; q; }
--        s/.*/./; q'`
--    done
--    test ! -n "$as_dirs" || mkdir $as_dirs
--  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" 
>&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
--   { (exit 1); exit 1; }; }; }
--
-   ac_builddir=.
- 
- if test "$ac_dir" != .; then
-@@ -29213,45 +28099,12 @@
-     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-     ac_top_srcdir=$ac_top_builddir$srcdir ;;
- esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
--  case "$ac_dir" in
--  .) ac_abs_builddir=`pwd`;;
--  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
--  *) ac_abs_builddir=`pwd`/"$ac_dir";;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
--  case ${ac_top_builddir}. in
--  .) ac_abs_top_builddir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
--  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
--  case $ac_srcdir in
--  .) ac_abs_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
--  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
--  esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
--  case $ac_top_srcdir in
--  .) ac_abs_top_srcdir=$ac_abs_builddir;;
--  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
--  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
--  esac;;
--esac
-+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-+# absolute.
-+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
- 
- 
-   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-@@ -29309,10 +28162,10 @@
-   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-     dirpart=`(dirname "$mf") 2>/dev/null ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--       X"$mf" : 'X\(//\)[^/]' \| \
--       X"$mf" : 'X\(//\)$' \| \
--       X"$mf" : 'X\(/\)' \| \
--       .     : '\(.\)' 2>/dev/null ||
-+         X"$mf" : 'X\(//\)[^/]' \| \
-+         X"$mf" : 'X\(//\)$' \| \
-+         X"$mf" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
- echo X"$mf" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -29348,10 +28201,10 @@
-     test -f "$dirpart/$file" && continue
-     fdir=`(dirname "$file") 2>/dev/null ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--       X"$file" : 'X\(//\)[^/]' \| \
--       X"$file" : 'X\(//\)$' \| \
--       X"$file" : 'X\(/\)' \| \
--       .     : '\(.\)' 2>/dev/null ||
-+         X"$file" : 'X\(//\)[^/]' \| \
-+         X"$file" : 'X\(//\)$' \| \
-+         X"$file" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
- echo X"$file" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-         /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-@@ -29367,10 +28220,10 @@
-       as_dirs="$as_dir $as_dirs"
-       as_dir=`(dirname "$as_dir") 2>/dev/null ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--       X"$as_dir" : 'X\(//\)[^/]' \| \
--       X"$as_dir" : 'X\(//\)$' \| \
--       X"$as_dir" : 'X\(/\)' \| \
--       .     : '\(.\)' 2>/dev/null ||
-+         X"$as_dir" : 'X\(//\)[^/]' \| \
-+         X"$as_dir" : 'X\(//\)$' \| \
-+         X"$as_dir" : 'X\(/\)' \| \
-+         .     : '\(.\)' 2>/dev/null ||
- echo X"$as_dir" |
-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-         /^X\(\/\/\)[^/].*/{ s//\1/; q; }


Index: control-center.spec
===================================================================
RCS file: /cvs/dist/rpms/control-center/devel/control-center.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- control-center.spec 3 Aug 2005 15:22:54 -0000       1.78
+++ control-center.spec 3 Aug 2005 15:38:31 -0000       1.79
@@ -32,7 +32,6 @@
 Patch2: control-center-2.11.5-fedora-apps.patch
 Patch3: control-center-2.9.4-filesel.patch
 Patch4: control-center-2.10.1-mark-tool-buttons-important.patch
-Patch5: control-center-2.11.5-acme-dummy.patch
 # patch out the xft 2.1.7 requirement until we ship modular xorg
 Patch6: control-center-2.11.6-xft.patch
 
@@ -95,7 +94,6 @@
 %patch2 -p1 -b .fedora-apps
 %patch3 -p1 -b .filesel
 %patch4 -p1 -b .mark-tool-buttons-important
-%patch5 -p1 -b .acme-dummy
 %patch6 -p1 -b .xft
 
 %build

--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits

<Prev in Thread] Current Thread [Next in Thread>
  • rpms/control-center/devel control-center-2.11.6-xft.patch, 1.1, 1.2 control-center.spec, 1.78, 1.79, fedora-cvs-commits <=