From 31e564c907d3ed8256cc6e148cf1db6b45f6ae64 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Jul 31 2009 16:38:18 +0000
Subject: - 5.2.4. Re-enabled compiler optimization for ppc64.


---

diff --git a/gutenprint-O6.patch b/gutenprint-O6.patch
index 13e4fc8..ba997f0 100644
--- a/gutenprint-O6.patch
+++ b/gutenprint-O6.patch
@@ -1,6 +1,6 @@
-diff -up gutenprint-5.2.2/configure.ac.O6 gutenprint-5.2.2/configure.ac
---- gutenprint-5.2.2/configure.ac.O6	2008-11-19 11:23:29.000000000 +0000
-+++ gutenprint-5.2.2/configure.ac	2008-11-19 11:24:35.000000000 +0000
+diff -up gutenprint-5.2.4/configure.ac.O6 gutenprint-5.2.4/configure.ac
+--- gutenprint-5.2.4/configure.ac.O6	2009-07-31 17:29:06.175961565 +0100
++++ gutenprint-5.2.4/configure.ac	2009-07-31 17:29:32.117962246 +0100
 @@ -625,27 +625,6 @@ AH_TEMPLATE(PKGMODULEDIR,, [Package modu
  PKGMODULEDIR="${PACKAGE_LIB_DIR}/${GUTENPRINT_RELEASE_VERSION}/modules"
  AC_DEFINE_UNQUOTED(PKGMODULEDIR, ["$PKGMODULEDIR"])
@@ -29,10 +29,10 @@ diff -up gutenprint-5.2.2/configure.ac.O6 gutenprint-5.2.2/configure.ac
  AC_SUBST(GNUCFLAGS)
  
  AH_TEMPLATE([HAVE_GCC_ATTRIBUTES],
-diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
---- gutenprint-5.2.2/configure.O6	2008-11-19 11:23:32.000000000 +0000
-+++ gutenprint-5.2.2/configure	2008-11-19 11:24:49.000000000 +0000
-@@ -26509,410 +26509,6 @@ cat >>confdefs.h <<_ACEOF
+diff -up gutenprint-5.2.4/configure.O6 gutenprint-5.2.4/configure
+--- gutenprint-5.2.4/configure.O6	2009-07-31 17:29:39.376961485 +0100
++++ gutenprint-5.2.4/configure	2009-07-31 17:31:08.881961477 +0100
+@@ -17925,421 +17925,6 @@ cat >>confdefs.h <<_ACEOF
  _ACEOF
  
  
@@ -40,8 +40,8 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -
 -  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=131072 ; 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; }
+-  { $as_echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
 -  stp_acOLDCFLAGS="${CFLAGS}"
 -  CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -65,26 +65,27 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--   { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; };
+-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; };
 -        stp_newCFLAGS="$CFLAGS"
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_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; };
+-	 { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
 -	stp_newCFLAGS="$stp_acOLDCFLAGS"
 -fi
 -
@@ -98,8 +99,8 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -
 -  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; }
+-  { $as_echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
 -  stp_acOLDCFLAGS="${CFLAGS}"
 -  CFLAGS="${GNUCFLAGS} ${stp_ac_arg}"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -123,26 +124,27 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--   { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; };
+-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; };
 -        stp_newCFLAGS="$CFLAGS"
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_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; };
+-	 { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
 -	stp_newCFLAGS="$stp_acOLDCFLAGS"
 -fi
 -
@@ -155,8 +157,8 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -  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; }
+-  { $as_echo "$as_me:$LINENO: checking if ${CC} supports -g" >&5
+-$as_echo_n "checking if ${CC} supports -g... " >&6; }
 -  stp_acOLDCFLAGS="${CFLAGS}"
 -  CFLAGS="${CFLAGS} -g"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -180,26 +182,27 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--   { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; };
+-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; };
 -        stp_newCFLAGS="$CFLAGS"
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_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; };
+-	 { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
 -	stp_newCFLAGS="$stp_acOLDCFLAGS"
 -fi
 -
@@ -212,8 +215,8 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -  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; }
+-  { $as_echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
 -  stp_acOLDCFLAGS="${CFLAGS}"
 -  CFLAGS="${CFLAGS} ${stp_ac_arg}"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -237,26 +240,27 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--   { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; };
+-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; };
 -        stp_newCFLAGS="$CFLAGS"
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_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; };
+-	 { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
 -	stp_newCFLAGS="$stp_acOLDCFLAGS"
 -fi
 -
@@ -271,8 +275,8 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -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; }
+-  { $as_echo "$as_me:$LINENO: checking if ${CC} supports -g" >&5
+-$as_echo_n "checking if ${CC} supports -g... " >&6; }
 -  stp_acOLDCFLAGS="${CFLAGS}"
 -  CFLAGS="${CFLAGS} -g"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -296,26 +300,27 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--   { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; };
+-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; };
 -        stp_newCFLAGS="$CFLAGS"
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_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; };
+-	 { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
 -	stp_newCFLAGS="$stp_acOLDCFLAGS"
 -fi
 -
@@ -328,8 +333,8 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -  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; }
+-  { $as_echo "$as_me:$LINENO: checking if ${CC} supports ${stp_ac_arg}" >&5
+-$as_echo_n "checking if ${CC} supports ${stp_ac_arg}... " >&6; }
 -  stp_acOLDCFLAGS="${CFLAGS}"
 -  CFLAGS="${CFLAGS} ${stp_ac_arg}"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -353,26 +358,27 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--   { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; };
+-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; };
 -        stp_newCFLAGS="$CFLAGS"
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_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; };
+-	 { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
 -	stp_newCFLAGS="$stp_acOLDCFLAGS"
 -fi
 -
@@ -387,8 +393,8 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -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; }
+-  { $as_echo "$as_me:$LINENO: checking if ${CC} supports -pg" >&5
+-$as_echo_n "checking if ${CC} supports -pg... " >&6; }
 -  stp_acOLDCFLAGS="${CFLAGS}"
 -  CFLAGS="${CFLAGS} -pg"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -412,26 +418,27 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$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
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--   { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; };
+-   { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; };
 -        stp_newCFLAGS="$CFLAGS"
 -else
--  echo "$as_me: failed program was:" >&5
+-  $as_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; };
+-	 { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; };
 -	stp_newCFLAGS="$stp_acOLDCFLAGS"
 -fi
 -
@@ -440,6 +447,10 @@ diff -up gutenprint-5.2.2/configure.O6 gutenprint-5.2.2/configure
 -  CFLAGS="${stp_newCFLAGS}"
 -
 -fi
- 
- 
- 
+-
+-
+-
+-
+ { $as_echo "$as_me:$LINENO: checking if $CC supports __attribute__ syntax" >&5
+ $as_echo_n "checking if $CC supports __attribute__ syntax... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
diff --git a/gutenprint.spec b/gutenprint.spec
index af32465..3793602 100644
--- a/gutenprint.spec
+++ b/gutenprint.spec
@@ -3,8 +3,8 @@
 
 Name:           gutenprint
 Summary:        Printer Drivers Package.
-Version:        5.2.3
-Release:        8%{?dist}
+Version:        5.2.4
+Release:        1%{?dist}
 Group:          System Environment/Base
 URL:            http://gimp-print.sourceforge.net/
 Source0:        http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
@@ -138,9 +138,6 @@ Epson, HP and compatible printers..
 %patch2 -p1 -b .selinux
 
 %build
-%ifarch ppc64
-export CFLAGS="${CFLAGS} -O0"
-%endif
 %configure --disable-static --disable-dependency-tracking  \
             --with-foomatic --with-ghostscript \
             --disable-libgutenprintui --without-gimp \
@@ -264,6 +261,9 @@ fi
 /bin/rm -f /var/cache/foomatic/*
 
 %changelog
+* Fri Jul 31 2009 Tim Waugh <twaugh@redhat.com> 5.2.4-1
+- 5.2.4.  Re-enabled compiler optimization for ppc64.
+
 * Thu Jul 30 2009 Tim Waugh <twaugh@redhat.com> 5.2.3-8
 - Don't show output when upgrading cups sub-package (bug #507324).
 - Split documentation into doc sub-package (bug #492452).