rpms/evolution-connector/devel evolution-connector.spec, 1.99, 1.100 evolution-exchange-2.7.2-no_gnome_common.patch, 1.3, 1.4 evolution-exchange-2.10.1-fix-64bit-configure.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 26 18:28:44 UTC 2007
Author: mbarnes
Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11520
Modified Files:
evolution-connector.spec
evolution-exchange-2.7.2-no_gnome_common.patch
Removed Files:
evolution-exchange-2.10.1-fix-64bit-configure.patch
Log Message:
* Thu Apr 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-3.fc7
- Regenerate configure to pick up 64-bit changes to acinclude.m4.
- Require autoconf and automake to build.
Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- evolution-connector.spec 26 Apr 2007 17:30:50 -0000 1.99
+++ evolution-connector.spec 26 Apr 2007 18:28:42 -0000 1.100
@@ -35,16 +35,14 @@
### Patches ###
Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch
-Patch12: evolution-exchange-2.10.1-fix-64bit-configure.patch
-
-Patch13: evolution-exchange-2.5.3-fix-marshaller.patch
+Patch12: evolution-exchange-2.5.3-fix-marshaller.patch
# Remove gnome-common macros from configure.in.
# We do not ship gnome-common (or at least we're not supposed to).
-Patch14: evolution-exchange-2.7.2-no_gnome_common.patch
+Patch13: evolution-exchange-2.7.2-no_gnome_common.patch
# GNOME bug #405916
-Patch15: evolution-exchange-2.9.6-fix-compiler-warnings.patch
+Patch14: evolution-exchange-2.9.6-fix-compiler-warnings.patch
### Dependencies ###
@@ -57,6 +55,8 @@
### Build Dependencies ###
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: db4-devel
BuildRequires: evolution >= %{evo_version}
BuildRequires: evolution-data-server-devel >= %{eds_version}
@@ -79,10 +79,9 @@
%setup -q -n evolution-exchange-%{version}
%patch11 -p1 -b .fix-64bit-acinclude.m4
-%patch12 -p1 -b .fix-64bit-configure
-%patch13 -p1 -b .fix-marshaller
-%patch14 -p1 -b .no_gnome_common
-%patch15 -p1 -b .fix-compiler-warnings
+%patch12 -p1 -b .fix-marshaller
+%patch13 -p1 -b .no_gnome_common
+%patch14 -p1 -b .fix-compiler-warnings
%build
export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -114,6 +113,9 @@
-Werror-implicit-function-declaration"
%endif
+# Regenerate configure to pick up acinclude.m4 changes
+autoreconf --force
+
%configure \
--enable-gtk-doc \
--with-openldap=%{_libdir}/evolution-openldap \
@@ -153,7 +155,8 @@
%changelog
* Thu Apr 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-3.fc7
-- Patch configure to pick up 64-bit changes to acinclude.m4.
+- Regenerate configure to pick up 64-bit changes to acinclude.m4.
+- Require autoconf and automake to build.
* Thu Apr 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-2.fc7
- Fix a misnamed macro (RH bug #237807).
evolution-exchange-2.7.2-no_gnome_common.patch:
configure.in | 2 --
1 files changed, 2 deletions(-)
Index: evolution-exchange-2.7.2-no_gnome_common.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-exchange-2.7.2-no_gnome_common.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-exchange-2.7.2-no_gnome_common.patch 9 Apr 2007 16:56:03 -0000 1.3
+++ evolution-exchange-2.7.2-no_gnome_common.patch 26 Apr 2007 18:28:42 -0000 1.4
@@ -9,160 +9,3 @@
case $CFLAGS in
*-Wall*)
CFLAGS="$CFLAGS -Wno-sign-compare"
---- evolution-exchange-2.10.1/configure.no_gnome_common 2007-04-09 08:03:50.000000000 -0400
-+++ evolution-exchange-2.10.1/configure 2007-04-09 12:45:51.000000000 -0400
-@@ -23393,154 +23393,6 @@
-
-
-
-- # Check whether --enable-compile-warnings was given.
--if test "${enable_compile_warnings+set}" = set; then
-- enableval=$enable_compile_warnings;
--else
-- enable_compile_warnings="maximum"
--fi
--
--
-- warnCFLAGS=
-- if test "x$GCC" != xyes; then
-- enable_compile_warnings=no
-- fi
--
-- warning_flags=
-- realsave_CFLAGS="$CFLAGS"
--
-- case "$enable_compile_warnings" in
-- no)
-- warning_flags=
-- ;;
-- minimum)
-- warning_flags="-Wall"
-- ;;
-- yes)
-- warning_flags="-Wall -Wmissing-prototypes"
-- ;;
-- maximum|error)
-- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-- CFLAGS="$warning_flags $CFLAGS"
-- for option in -Wno-sign-compare; do
-- SAVE_CFLAGS="$CFLAGS"
-- CFLAGS="$CFLAGS $option"
-- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
--echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; }
-- 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
-- has_option=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- has_option=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-- CFLAGS="$SAVE_CFLAGS"
-- { echo "$as_me:$LINENO: result: $has_option" >&5
--echo "${ECHO_T}$has_option" >&6; }
-- if test $has_option = yes; then
-- warning_flags="$warning_flags $option"
-- fi
-- unset has_option
-- unset SAVE_CFLAGS
-- done
-- unset option
-- if test "$enable_compile_warnings" = "error" ; then
-- warning_flags="$warning_flags -Werror"
-- fi
-- ;;
-- *)
-- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
--echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
-- { (exit 1); exit 1; }; }
-- ;;
-- esac
-- CFLAGS="$realsave_CFLAGS"
-- { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
--echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; }
-- { echo "$as_me:$LINENO: result: $warning_flags" >&5
--echo "${ECHO_T}$warning_flags" >&6; }
--
-- # Check whether --enable-iso-c was given.
--if test "${enable_iso_c+set}" = set; then
-- enableval=$enable_iso_c;
--else
-- enable_iso_c=no
--fi
--
--
-- { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
--echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; }
-- complCFLAGS=
-- if test "x$enable_iso_c" != "xno"; then
-- if test "x$GCC" = "xyes"; then
-- case " $CFLAGS " in
-- *\ \ -ansi\ \ *) ;;
-- *) complCFLAGS="$complCFLAGS -ansi" ;;
-- esac
-- case " $CFLAGS " in
-- *\ \ -pedantic\ \ *) ;;
-- *) complCFLAGS="$complCFLAGS -pedantic" ;;
-- esac
-- fi
-- fi
-- { echo "$as_me:$LINENO: result: $complCFLAGS" >&5
--echo "${ECHO_T}$complCFLAGS" >&6; }
--
-- WARN_CFLAGS="$warning_flags $complCFLAGS"
--
--
--CFLAGS="$CFLAGS $WARN_CFLAGS"
- case $CFLAGS in
- *-Wall*)
- CFLAGS="$CFLAGS -Wno-sign-compare"
--- evolution-exchange-2.10.1-fix-64bit-configure.patch DELETED ---
More information about the fedora-cvs-commits
mailing list