From ceb4d1a3167849fd67aa45bf984a62b266ed86d8 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 4 May 2007 14:27:34 +0000
Subject: [PATCH] - Don't add extra compiler flags.

---
 gutenprint-O6.patch | 567 ++++++++++++++++++++++++++++++++++++++++++++
 gutenprint.spec     |   3 +
 2 files changed, 570 insertions(+)
 create mode 100644 gutenprint-O6.patch

diff --git a/gutenprint-O6.patch b/gutenprint-O6.patch
new file mode 100644
index 0000000..faf4105
--- /dev/null
+++ b/gutenprint-O6.patch
@@ -0,0 +1,567 @@
+--- gutenprint-5.0.0.99.1/configure.ac.O6	2007-05-04 15:22:21.000000000 +0100
++++ gutenprint-5.0.0.99.1/configure.ac	2007-05-04 15:23:39.000000000 +0100
+@@ -645,29 +645,6 @@
+ PKGMODULEDIR="${PACKAGE_LIB_DIR}/${PACKAGE_VERSION}/modules"
+ AC_DEFINE_UNQUOTED(PKGMODULEDIR, ["$PKGMODULEDIR"])
+ 
+-dnl Compiler flags
+-if test x$ac_compiler_gnu = "xyes"; then
+-  STP_ADD_COMPILER_ARGS([-Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=1048576],, [GNUCFLAGS])
+-  if test x${USE_MAINTAINER_MODE} = xyes ; then
+-    STP_ADD_COMPILER_ARGS([-pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS])
+-  fi
+-  if test x$ENABLE_DEBUG = xyes ; then
+-    STP_ADD_COMPILER_ARG([-g])
+-  else
+-    STP_ADD_FIRST_COMPILER_ARG([-O6 -O3 -O2 -O1 -O])
+-  fi
+-else
+-  if test x$ENABLE_DEBUG = xyes ; then
+-    STP_ADD_COMPILER_ARG([-g])
+-  else
+-    STP_ADD_FIRST_COMPILER_ARG([-O])
+-  fi
+-fi
+-if test x$ENABLE_PROFILE = xyes ; then
+-  STP_ADD_COMPILER_ARG([-pg])
+-fi
+-AC_SUBST(GNUCFLAGS)
+-
+ AH_TEMPLATE([HAVE_GCC_ATTRIBUTES],
+             [Define to 1 if GCC special attributes are supported])
+ AC_MSG_CHECKING([if $CC supports __attribute__ syntax])
+--- gutenprint-5.0.0.99.1/configure.O6	2007-05-04 15:22:29.000000000 +0100
++++ gutenprint-5.0.0.99.1/configure	2007-05-04 15:25:59.000000000 +0100
+@@ -26076,532 +26076,6 @@
+ _ACEOF
+ 
+ 
+-if test x$ac_compiler_gnu = "xyes"; then
+-
+-  for stp_ac_arg in -Wall -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wwrite-strings -Werror-implicit-function-declaration -Winline -Wformat=2 -finline-limit=1048576 ; do
+-
+-  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+-echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
+-  stp_acOLDCFLAGS="${CFLAGS}"
+-  CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-   { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; };
+-        stp_newCFLAGS="$CFLAGS"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	 { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; };
+-	stp_newCFLAGS="$stp_acOLDCFLAGS"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  CFLAGS="$stp_acOLDCFLAGS"
+-  GNUCFLAGS="${stp_newCFLAGS}"
+-
+-  done
+-
+-  if test x${USE_MAINTAINER_MODE} = xyes ; then
+-
+-  for stp_ac_arg in -pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls ; do
+-
+-  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+-echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
+-  stp_acOLDCFLAGS="${CFLAGS}"
+-  CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-   { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; };
+-        stp_newCFLAGS="$CFLAGS"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	 { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; };
+-	stp_newCFLAGS="$stp_acOLDCFLAGS"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  CFLAGS="$stp_acOLDCFLAGS"
+-  GNUCFLAGS="${stp_newCFLAGS}"
+-
+-  done
+-
+-  fi
+-  if test x$ENABLE_DEBUG = xyes ; then
+-
+-  { echo "$as_me:$LINENO: checking if ${CC} supports -g" >&5
+-echo $ECHO_N "checking if ${CC} supports -g... $ECHO_C" >&6; }
+-  stp_acOLDCFLAGS="${CFLAGS}"
+-  CFLAGS="${CFLAGS} -g"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-   { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; };
+-        stp_newCFLAGS="$CFLAGS"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	 { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; };
+-	stp_newCFLAGS="$stp_acOLDCFLAGS"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  CFLAGS="$stp_acOLDCFLAGS"
+-  CFLAGS="${stp_newCFLAGS}"
+-
+-  else
+-
+-  for stp_ac_arg in -O6 -O3 -O2 -O1 -O ; do
+-    stp_ac_save_CFLAGS="${CFLAGS}"
+-
+-  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+-echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
+-  stp_acOLDCFLAGS="${CFLAGS}"
+-  CFLAGS="${CFLAGS} ${stp_ac_arg}"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-   { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; };
+-        stp_newCFLAGS="$CFLAGS"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	 { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; };
+-	stp_newCFLAGS="$stp_acOLDCFLAGS"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  CFLAGS="$stp_acOLDCFLAGS"
+-  CFLAGS="${stp_newCFLAGS}"
+-
+-    test "${stp_ac_save_CFLAGS}" != "${CFLAGS}" && break
+-  done
+-
+-  fi
+-else
+-  if test x$ENABLE_DEBUG = xyes ; then
+-
+-  { echo "$as_me:$LINENO: checking if ${CC} supports -g" >&5
+-echo $ECHO_N "checking if ${CC} supports -g... $ECHO_C" >&6; }
+-  stp_acOLDCFLAGS="${CFLAGS}"
+-  CFLAGS="${CFLAGS} -g"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-   { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; };
+-        stp_newCFLAGS="$CFLAGS"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	 { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; };
+-	stp_newCFLAGS="$stp_acOLDCFLAGS"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  CFLAGS="$stp_acOLDCFLAGS"
+-  CFLAGS="${stp_newCFLAGS}"
+-
+-  else
+-
+-  for stp_ac_arg in -O ; do
+-    stp_ac_save_CFLAGS="${CFLAGS}"
+-
+-  { echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+-echo $ECHO_N "checking if ${CC} supports ${stp_ac_arg}... $ECHO_C" >&6; }
+-  stp_acOLDCFLAGS="${CFLAGS}"
+-  CFLAGS="${CFLAGS} ${stp_ac_arg}"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-   { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; };
+-        stp_newCFLAGS="$CFLAGS"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	 { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; };
+-	stp_newCFLAGS="$stp_acOLDCFLAGS"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  CFLAGS="$stp_acOLDCFLAGS"
+-  CFLAGS="${stp_newCFLAGS}"
+-
+-    test "${stp_ac_save_CFLAGS}" != "${CFLAGS}" && break
+-  done
+-
+-  fi
+-fi
+-if test x$ENABLE_PROFILE = xyes ; then
+-
+-  { echo "$as_me:$LINENO: checking if ${CC} supports -pg" >&5
+-echo $ECHO_N "checking if ${CC} supports -pg... $ECHO_C" >&6; }
+-  stp_acOLDCFLAGS="${CFLAGS}"
+-  CFLAGS="${CFLAGS} -pg"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-   { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; };
+-        stp_newCFLAGS="$CFLAGS"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	 { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; };
+-	stp_newCFLAGS="$stp_acOLDCFLAGS"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  CFLAGS="$stp_acOLDCFLAGS"
+-  CFLAGS="${stp_newCFLAGS}"
+-
+-fi
+-
+-
+-
+ 
+ { echo "$as_me:$LINENO: checking if $CC supports __attribute__ syntax" >&5
+ echo $ECHO_N "checking if $CC supports __attribute__ syntax... $ECHO_C" >&6; }
diff --git a/gutenprint.spec b/gutenprint.spec
index 260af30..3c8a747 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -10,6 +10,7 @@ URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
 Patch0:         gutenprint-menu.patch
 Patch1:         gutenprint-lpstat.patch
+Patch2:         gutenprint-O6.patch
 License:        GPL 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  cups-libs >= 1.1.22-0.rc1.9.10, cups >= 1.1.22-0.rc1.9.10 
@@ -123,6 +124,7 @@ Epson, HP and compatible printers..
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .menu
 %patch1 -p1 -b .lpstat
+%patch2 -p1 -b .O6
 
 %build
 %configure --disable-static --disable-dependency-tracking  \
@@ -231,6 +233,7 @@ exit 0
 
 %changelog
 * Fri May  4 2007 Tim Waugh <twaugh@redhat.com> 5.0.0.99.1-3
+- Don't add extra compiler flags.
 - Moved gimp-print obsoletes/provides to the foomatic sub-package
   (bug #238890).