rpms/gutenprint/FC-6 gutenprint-O6.patch, NONE, 1.1 gutenprint.spec, 1.4, 1.5
Tim Waugh (twaugh)
fedora-extras-commits at redhat.com
Fri Jun 29 12:54:06 UTC 2007
Author: twaugh
Update of /cvs/extras/rpms/gutenprint/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20560
Modified Files:
gutenprint.spec
Added Files:
gutenprint-O6.patch
Log Message:
* Fri Jun 29 2007 Tim Waugh <twaugh at redhat.com> 5.0.1-1
- Don't add extra compiler flags.
- Package the CUPS driver in sbindir and put a symlink in the CUPS ServerBin
directory to work around bug #231015.
- Disable libgutenprintui (GTK+ 1.2 library). Build requires gtk2-devel,
not gtk+-devel.
- No longer need PPDs sub-packages: CUPS driver is included in the cups
sub-package.
gutenprint-O6.patch:
--- NEW FILE gutenprint-O6.patch ---
--- 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; }
Index: gutenprint.spec
===================================================================
RCS file: /cvs/extras/rpms/gutenprint/FC-6/gutenprint.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gutenprint.spec 29 Jun 2007 11:43:36 -0000 1.4
+++ gutenprint.spec 29 Jun 2007 12:53:31 -0000 1.5
@@ -8,12 +8,14 @@
Group: System Environment/Base
URL: http://gimp-print.sourceforge.net/
Source0: http://dl.sf.net/gimp-print/gutenprint-%{version}.tar.bz2
+Patch2: gutenprint-O6.patch
+Patch3: gutenprint-selinux.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
BuildRequires: gettext-devel,cups-devel,pkgconfig,gimp-devel
BuildRequires: libtiff-devel,libjpeg-devel,libpng-devel
-BuildRequires: foomatic,gtk+-devel
+BuildRequires: foomatic,gtk2-devel
%if %{build_with_ijs_support}
BuildRequires: ghostscript-devel
%endif
@@ -201,6 +203,38 @@
Group: Applications/Publishing
Requires: cups >= 1.2.1-1.7
Requires: gimp-print-cups
+Obsoletes: gutenprint-ppds-cs < 5.0.0-8
+Provides: gutenprint-ppds-cs = %{version}-%{release}
+Obsoletes: gutenprint-ppds-da < 5.0.0-8
+Provides: gutenprint-ppds-da = %{version}-%{release}
+Obsoletes: gutenprint-ppds-de < 5.0.0-8
+Provides: gutenprint-ppds-de = %{version}-%{release}
+Obsoletes: gutenprint-ppds-el < 5.0.0-8
+Provides: gutenprint-ppds-el = %{version}-%{release}
+Obsoletes: gutenprint-ppds-en_GB < 5.0.0-8
+Provides: gutenprint-ppds-en_GB = %{version}-%{release}
+Obsoletes: gutenprint-ppds-es < 5.0.0-8
+Provides: gutenprint-ppds-es = %{version}-%{release}
+Obsoletes: gutenprint-ppds-fr < 5.0.0-8
+Provides: gutenprint-ppds-fr = %{version}-%{release}
+Obsoletes: gutenprint-ppds-hu < 5.0.0-8
+Provides: gutenprint-ppds-hu = %{version}-%{release}
+Obsoletes: gutenprint-ppds-ja < 5.0.0-8
+Provides: gutenprint-ppds-ja = %{version}-%{release}
+Obsoletes: gutenprint-ppds-nb < 5.0.0-8
+Provides: gutenprint-ppds-nb = %{version}-%{release}
+Obsoletes: gutenprint-ppds-nl < 5.0.0-8
+Provides: gutenprint-ppds-nl = %{version}-%{release}
+Obsoletes: gutenprint-ppds-pl < 5.0.0-8
+Provides: gutenprint-ppds-pl = %{version}-%{release}
+Obsoletes: gutenprint-ppds-pt < 5.0.0-8
+Provides: gutenprint-ppds-pt = %{version}-%{release}
+Obsoletes: gutenprint-ppds-sk < 5.0.0-8
+Provides: gutenprint-ppds-sk = %{version}-%{release}
+Obsoletes: gutenprint-ppds-sv < 5.0.0-8
+Provides: gutenprint-ppds-sv = %{version}-%{release}
+Obsoletes: gutenprint-ppds-zh_TW < 5.0.0-8
+Provides: gutenprint-ppds-zh_TW = %{version}-%{release}
%description cups
This package contains native CUPS support for a wide range of Canon,
@@ -208,10 +242,16 @@
%prep
%setup -q -n %{name}-%{version}
+%patch2 -p1 -b .O6
+%patch3 -p1 -b .selinux
%build
+%ifarch ppc64
+export CFLAGS="${CFLAGS} -O0"
+%endif
%configure --disable-static --disable-dependency-tracking \
--with-foomatic --with-ghostscript \
+ --without-libgutenprintui \
--with-user-guide --with-samples \
--with-escputil --with-test --disable-rpath
@@ -220,6 +260,8 @@
%install
rm -rf %{buildroot}
make DESTDIR=%{buildroot} install
+mv %{buildroot}%{cups_serverbin}/driver/gutenprint.5.0 %{buildroot}%{_sbindir}
+ln -s %{_sbindir}/gutenprint.5.0 %{buildroot}%{cups_serverbin}/driver/
rm -rf %{buildroot}%{_datadir}/gutenprint/doc
rm -rf %{buildroot}%{_bindir}/escputil
@@ -306,81 +348,31 @@
%defattr(-, root, root,-)
%config(noreplace) %{_sysconfdir}/cups/command.types
%{_datadir}/cups/calibrate.ppm
-#%{cups_serverbin}cups/backend/*
-#%{cups_serverbin}/cups/filter/*
+#%{cups_serverbin}/backend/*
+#%{cups_serverbin}/filter/*
+%{cups_serverbin}/driver/*
#%{_bindir}/cups-calibrate
%{cups_serverbin}/filter/rastertogutenprint.5.0
%{_sbindir}/cups-genppd*
-%{_datadir}/cups/model/gutenprint/5.0/C
+%{_sbindir}/gutenprint.5.0
#%{_mandir}/man8/cups-calibrate.8*
%{_mandir}/man8/cups-genppd*.8*
-%files ppds-cs
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/cs
-
-%files ppds-da
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/da
-
-%files ppds-de
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/de
-
-%files ppds-el
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/el
-
-%files ppds-en_GB
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/en_GB
-
-%files ppds-es
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/es
-
-%files ppds-fr
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/fr
-
-%files ppds-hu
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/hu
+%post foomatic
+/bin/rm -f /var/cache/foomatic/*
-%files ppds-ja
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/ja
-
-%files ppds-nb
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/nb
-
-%files ppds-nl
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/nl
-
-%files ppds-pl
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/pl
-
-%files ppds-pt
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/pt
-
-%files ppds-sk
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/sk
-
-%files ppds-sv
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/sv
-
-%files ppds-zh_TW
-%defattr(-, root, root,-)
-%{_datadir}/cups/model/gutenprint/5.0/zh_TW
+%postun foomatic
+/bin/rm -f /var/cache/foomatic/*
%changelog
* Fri Jun 29 2007 Tim Waugh <twaugh at redhat.com> 5.0.1-1
+- Don't add extra compiler flags.
+- Package the CUPS driver in sbindir and put a symlink in the CUPS ServerBin
+ directory to work around bug #231015.
+- Disable libgutenprintui (GTK+ 1.2 library). Build requires gtk2-devel,
+ not gtk+-devel.
+- No longer need PPDs sub-packages: CUPS driver is included in the cups
+ sub-package.
- Don't change SELinux file context of installed PPDs (bug #246067).
- 5.0.1.
More information about the scm-commits
mailing list