rpms/blam/devel blam-1.8.5-gnome-print-sharp.patch, NONE, 1.1 blam-xulrunner-configure.patch, 1.1, 1.2 blam.spec, 1.24, 1.25
Tom Callaway
spot at fedoraproject.org
Mon Oct 27 17:31:08 UTC 2008
Author: spot
Update of /cvs/pkgs/rpms/blam/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32001
Modified Files:
blam-xulrunner-configure.patch blam.spec
Added Files:
blam-1.8.5-gnome-print-sharp.patch
Log Message:
rebuild for new gnome-sharp
blam-1.8.5-gnome-print-sharp.patch:
--- NEW FILE blam-1.8.5-gnome-print-sharp.patch ---
diff -up blam-1.8.5/configure.gnomeprintsharp blam-1.8.5/configure
--- blam-1.8.5/configure.gnomeprintsharp 2008-03-21 05:38:24.000000000 -0400
+++ blam-1.8.5/configure 2008-10-27 11:59:35.000000000 -0400
@@ -1,9 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.63.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -15,7 +15,7 @@ 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
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTE
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
+ else
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
+ fi
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
# 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
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@ -63,8 +91,6 @@ fi
# 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.
@@ -87,7 +113,7 @@ 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
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -100,17 +126,10 @@ PS2='> '
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- 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
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -158,7 +177,7 @@ else
as_have_required=no
fi
- if test $as_have_required = yes && (eval ":
+ if test $as_have_required = yes && (eval ":
(as_func_return () {
(exit \$1)
}
@@ -240,7 +259,7 @@ IFS=$as_save_IFS
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
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -261,7 +280,7 @@ _ASEOF
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
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -341,10 +360,10 @@ fi
if test "x$CONFIG_SHELL" != x; then
for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
@@ -413,9 +432,10 @@ fi
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
- echo Please tell autoconf at gnu.org about your system,
- echo including any error possibly output before this
- echo message
+ echo Please tell bug-autoconf at gnu.org about your system,
+ echo including any error possibly output before this message.
+ echo This can help us improve future autoconf versions.
+ echo Configuration will now proceed without shell functions.
}
@@ -451,7 +471,7 @@ test \$exitcode = 0") || {
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -479,7 +499,6 @@ case `echo -n x` in
*)
ECHO_N='-n';;
esac
-
if expr a : '\(a\)' >/dev/null 2>&1 &&
[...11541 lines suppressed...]
-
-while :
-do
- # Write a here document:
- cat >>$CONFIG_STATUS <<_ACEOF
- # First, check the format of the line:
- cat >"\$tmp/defines.sed" <<\\CEOF
-/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-b
-:def
-_ACEOF
- sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
- sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
- ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
- sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
- grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
if test x"$ac_file" != x-; then
- echo "/* $configure_input */" >"$tmp/config.h"
- cat "$ac_result" >>"$tmp/config.h"
- if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+ {
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+ } >"$tmp/config.h" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+ { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
else
- rm -f $ac_file
- mv "$tmp/config.h" $ac_file
+ rm -f "$ac_file"
+ mv "$tmp/config.h" "$ac_file" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
fi
else
- echo "/* $configure_input */"
- cat "$ac_result"
+ $as_echo "/* $configure_input */" \
+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+$as_echo "$as_me: error: could not create -" >&2;}
+ { (exit 1); exit 1; }; }
fi
- rm -f "$tmp/out12"
-# Compute $ac_file's index in $config_headers.
+# Compute "$ac_file"'s index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
case $_am_header in
- $ac_file | $ac_file:* )
+ "$ac_file" | "$ac_file":* )
break ;;
* )
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
-echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X$ac_file : 'X\(//\)[^/]' \| \
- X$ac_file : 'X\(//\)$' \| \
- X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
-echo X$ac_file |
+echo "timestamp for "$ac_file"" >`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -25515,8 +25779,8 @@ echo X$ac_file |
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
@@ -25537,7 +25801,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/
X"$mf" : 'X\(//\)[^/]' \| \
X"$mf" : 'X\(//\)$' \| \
X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$mf" |
+$as_echo X"$mf" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -25581,7 +25845,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][
X"$file" : 'X\(//\)[^/]' \| \
X"$file" : 'X\(//\)$' \| \
X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$file" |
+$as_echo X"$file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -25607,7 +25871,7 @@ echo X"$file" |
as_dirs=
while :; do
case $as_dir in #(
- *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
*) as_qdir=$as_dir;;
esac
as_dirs="'$as_qdir' $as_dirs"
@@ -25616,7 +25880,7 @@ $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" |
+$as_echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -25637,8 +25901,8 @@ echo X"$as_dir" |
test -d "$as_dir" && break
done
test -z "$as_dirs" || eval "mkdir $as_dirs"
- } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
{ (exit 1); exit 1; }; }; }
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
@@ -25675,8 +25939,8 @@ done
"$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
if test ! -f "po/Makefile"; then
- { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
-echo "$as_me: error: po/Makefile is not ready." >&2;}
+ { { $as_echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
+$as_echo "$as_me: error: po/Makefile is not ready." >&2;}
{ (exit 1); exit 1; }; }
fi
mv "po/Makefile" "po/Makefile.tmp"
@@ -25698,6 +25962,11 @@ _ACEOF
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -25719,6 +25988,10 @@ if test "$no_create" != yes; then
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
echo
diff -up blam-1.8.5/configure.in.gnomeprintsharp blam-1.8.5/configure.in
--- blam-1.8.5/configure.in.gnomeprintsharp 2008-03-21 05:32:18.000000000 -0400
+++ blam-1.8.5/configure.in 2008-10-27 11:59:30.000000000 -0400
@@ -49,6 +49,7 @@ GTKSHARP_REQUIRED_VERSION=2.8.2
GNOMESHARP_REQUIRED_VERSION=2.16.1
GCONF_REQUIRED_VERSION=2.4
GECKOSHARP_REQUIRED_VERSION=0.11
+GNOMEPRINTSHARP_REQUIRED_VERSION=2.18
PKG_CHECK_MODULES(BASE_DEPENDENCIES,
mono >= $MONO_REQUIRED_VERSION
@@ -60,7 +61,8 @@ PKG_CHECK_MODULES(BLAM,
gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION
gconf-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION
glade-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION
- gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION)
+ gnome-sharp-2.0 >= $GNOMESHARP_REQUIRED_VERSION
+ gnome-print-sharp-2.18 >= $GNOMEPRINTSHARP_REQUIRED_VERSION)
AC_SUBST(BLAM_LIBS)
blam-xulrunner-configure.patch:
Index: blam-xulrunner-configure.patch
===================================================================
RCS file: /cvs/pkgs/rpms/blam/devel/blam-xulrunner-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- blam-xulrunner-configure.patch 21 Jul 2008 13:50:43 -0000 1.1
+++ blam-xulrunner-configure.patch 27 Oct 2008 17:31:07 -0000 1.2
@@ -1,8 +1,8 @@
-diff -up blam-1.8.3/configure.old blam-1.8.3/configure
---- blam-1.8.3/configure.old 2006-11-17 01:29:56.000000000 +0100
-+++ blam-1.8.3/configure 2008-06-23 10:08:35.000000000 +0200
-@@ -22092,6 +22092,8 @@ fi
- echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6; }
+diff -up blam-1.8.5/configure.xlc blam-1.8.5/configure
+--- blam-1.8.5/configure.xlc 2008-10-27 12:00:43.000000000 -0400
++++ blam-1.8.5/configure 2008-10-27 12:10:38.000000000 -0400
+@@ -22257,6 +22257,8 @@ fi
+ $as_echo_n "checking which mozilla to use... " >&6; }
MOZILLA=
+MOZILLA_XPCOM=
@@ -10,7 +10,7 @@
# Check whether --with-mozilla was given.
if test "${with_mozilla+set}" = set; then
-@@ -22100,16 +22102,30 @@ fi
+@@ -22265,16 +22267,30 @@ fi
if test "x$MOZILLA" = "x"; then
@@ -41,9 +41,9 @@
+ MOZILLA_XPCOM=mozilla-xpcom
+ MOZILLA_GTKMOZEMBED=mozilla-gtkmozembed
else
- { { echo "$as_me:$LINENO: error: no mozilla installation found" >&5
- echo "$as_me: error: no mozilla installation found" >&2;}
-@@ -22131,13 +22147,12 @@ mozilla) min_version=1.7 flavour=mozilla
+ { { $as_echo "$as_me:$LINENO: error: no mozilla installation found" >&5
+ $as_echo "$as_me: error: no mozilla installation found" >&2;}
+@@ -22296,13 +22312,12 @@ mozilla) min_version=1.7 flavour=mozilla
firefox) min_version=0.10 flavour=toolkit ;;
thunderbird) min_version=0.8 flavour=toolkit ;;
xulrunner) min_version=1.8 flavour=toolkit ;;
@@ -56,41 +56,41 @@
-
-
pkg_failed=no
- { echo "$as_me:$LINENO: checking for MOZILLA_COMPONENT" >&5
- echo $ECHO_N "checking for MOZILLA_COMPONENT... $ECHO_C" >&6; }
-@@ -22147,12 +22162,12 @@ if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:$LINENO: checking for MOZILLA_COMPONENT" >&5
+ $as_echo_n "checking for MOZILLA_COMPONENT... " >&6; }
+@@ -22312,12 +22327,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5
- ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA_GTKMOZEMBED >= \$min_version \$MOZILLA_XPCOM >= \$min_version\"") >&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA_GTKMOZEMBED >= \$min_version \$MOZILLA_XPCOM >= \$min_version\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" 2>/dev/null`
+ pkg_cv_MOZILLA_COMPONENT_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version" 2>/dev/null`
else
pkg_failed=yes
fi
-@@ -22165,12 +22180,12 @@ if test -n "$PKG_CONFIG"; then
+@@ -22330,12 +22345,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS"
else
if test -n "$PKG_CONFIG" && \
-- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-gtkmozembed >= \$min_version \$MOZILLA-xpcom >= \$min_version\"") >&5
- ($PKG_CONFIG --exists --print-errors "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version") 2>&5
-+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA_GTKMOZEMBED >= \$min_version \$MOZILLA_XPCOM >= \$min_version\"") >&5
++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA_GTKMOZEMBED >= \$min_version \$MOZILLA_XPCOM >= \$min_version\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "$MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version" 2>/dev/null`
+ pkg_cv_MOZILLA_COMPONENT_LIBS=`$PKG_CONFIG --libs "$MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version" 2>/dev/null`
else
pkg_failed=yes
fi
-@@ -22189,14 +22204,14 @@ else
+@@ -22354,14 +22369,14 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -103,21 +103,21 @@
# Put the nasty error message in config.log where it belongs
echo "$MOZILLA_COMPONENT_PKG_ERRORS" >&5
-- { { echo "$as_me:$LINENO: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met:
-+ { { echo "$as_me:$LINENO: error: Package requirements ($MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version) were not met:
+- { { $as_echo "$as_me:$LINENO: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met:
++ { { $as_echo "$as_me:$LINENO: error: Package requirements ($MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version) were not met:
$MOZILLA_COMPONENT_PKG_ERRORS
-@@ -22207,7 +22222,7 @@ Alternatively, you may set the environme
+@@ -22372,7 +22387,7 @@ Alternatively, you may set the environme
and MOZILLA_COMPONENT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
--echo "$as_me: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met:
-+echo "$as_me: error: Package requirements ($MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version) were not met:
+-$as_echo "$as_me: error: Package requirements ($MOZILLA-gtkmozembed >= $min_version $MOZILLA-xpcom >= $min_version) were not met:
++$as_echo "$as_me: error: Package requirements ($MOZILLA_GTKMOZEMBED >= $min_version $MOZILLA_XPCOM >= $min_version) were not met:
$MOZILLA_COMPONENT_PKG_ERRORS
-@@ -22251,13 +22266,13 @@ fi
+@@ -22418,13 +22433,13 @@ fi
@@ -134,7 +134,7 @@
ac_ext=cpp
-@@ -22333,7 +22348,7 @@ fi
+@@ -22503,7 +22518,7 @@ fi
@@ -142,10 +142,10 @@
+CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA_XPCOM`"
- { echo "$as_me:$LINENO: checking whether nsIFilePicker methods expect nsAString&" >&5
-@@ -22598,16 +22613,16 @@ if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:$LINENO: checking whether nsIFilePicker methods expect nsAString&" >&5
+@@ -22723,16 +22738,16 @@ if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.2
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- \$MOZILLA-gtkmozembed\"") >&5
+ \$MOZILLA_GTKMOZEMBED\"") >&5
@@ -154,7 +154,7 @@
- $MOZILLA-gtkmozembed") 2>&5
+ $MOZILLA_GTKMOZEMBED") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_LIBBLAM_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
@@ -163,9 +163,9 @@
else
pkg_failed=yes
fi
-@@ -22622,16 +22637,16 @@ if test -n "$PKG_CONFIG"; then
+@@ -22747,16 +22762,16 @@ if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.2
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- \$MOZILLA-gtkmozembed\"") >&5
+ \$MOZILLA_GTKMOZEMBED\"") >&5
@@ -174,7 +174,7 @@
- $MOZILLA-gtkmozembed") 2>&5
+ $MOZILLA_GTKMOZEMBED") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_LIBBLAM_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
@@ -183,7 +183,7 @@
else
pkg_failed=yes
fi
-@@ -22652,18 +22667,18 @@ fi
+@@ -22777,18 +22792,18 @@ fi
if test $_pkg_short_errors_supported = yes; then
LIBBLAM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
@@ -198,16 +198,16 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBBLAM_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.2
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- $MOZILLA-gtkmozembed) were not met:
+ $MOZILLA_GTKMOZEMBED) were not met:
$LIBBLAM_PKG_ERRORS
-@@ -22676,7 +22691,7 @@ See the pkg-config man page for more det
+@@ -22801,7 +22816,7 @@ See the pkg-config man page for more det
" >&5
- echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.2
+ $as_echo "$as_me: error: Package requirements (gtk+-2.0 >= 2.2
libgnomeui-2.0 >= 2.2
- $MOZILLA-gtkmozembed) were not met:
+ $MOZILLA_GTKMOZEMBED) were not met:
Index: blam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/blam/devel/blam.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- blam.spec 29 Sep 2008 04:39:59 -0000 1.24
+++ blam.spec 27 Oct 2008 17:31:07 -0000 1.25
@@ -5,7 +5,7 @@
Name: blam
Version: 1.8.5
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: An RSS/RDF feed reader
Group: Applications/Internet
@@ -20,6 +20,7 @@
#Patch3: %{name}-CVE-2005-4790.patch
Patch4: %{name}-xulrunner.patch
Patch5: %{name}-xulrunner-configure.patch
+Patch6: blam-1.8.5-gnome-print-sharp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
## Various Mono dependencies are not available for ppc64; see bug 241850.
@@ -34,6 +35,7 @@
BuildRequires: gecko-sharp2-devel >= 0.12-6
BuildRequires: gettext
BuildRequires: gnome-sharp-devel
+BuildRequires: gnome-desktop-sharp-devel
BuildRequires: gtk-sharp2-devel
BuildRequires: gtk-sharp2-gapi
BuildRequires: libgnomeui-devel
@@ -70,6 +72,7 @@
#patch2 -p0 -b .fix-THEME_DIR-path
#patch3 -p1 -b .CVE-2005-4790
%patch4 -p1 -b .xl
+%patch6 -p1 -b .gnomeprintsharp
%patch5 -p1 -b .xlc
%build
@@ -135,6 +138,9 @@
%{_mandir}/man?/%{name}.1*
%changelog
+* Mon Oct 27 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.8.5-3
+- rebuild against new gnome-sharp
+
* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.8.5-2
- Rebuild against newer gecko
More information about the scm-commits
mailing list