rpms/evolution-data-server/devel evolution-data-server-1.5.4-make_imap4_optional.patch, 1.1, 1.2 evolution-data-server.spec, 1.78, 1.79

[fedora-cvs-commits at redhat.com]

Author: dmalcolm

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3089

Modified Files:
	evolution-data-server-1.5.4-make_imap4_optional.patch 
	evolution-data-server.spec 
Log Message:
* Mon Jan  9 2006 David Malcolm <dmalcolm at cassandra.boston.redhat.com> - 1.5.4-4
- updated patch 300 to remove usage of GNOME_COMPILE_WARNINGS from configure.in
  (since gnome-common might not be available when we rerun the autotools)



evolution-data-server-1.5.4-make_imap4_optional.patch:
 camel/providers/Makefile.am |    6 +++++-
 configure.in                |   12 ++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

Index: evolution-data-server-1.5.4-make_imap4_optional.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.5.4-make_imap4_optional.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-1.5.4-make_imap4_optional.patch	9 Jan 2006 21:56:12 -0000	1.1
+++ evolution-data-server-1.5.4-make_imap4_optional.patch	9 Jan 2006 22:31:25 -0000	1.2
@@ -1,5 +1,5 @@
---- evolution-data-server-1.5.4/configure.in.make_imap4_optional	2006-01-09 14:25:43.000000000 -0500
-+++ evolution-data-server-1.5.4/configure.in	2006-01-09 14:28:32.000000000 -0500
+--- evolution-data-server-1.5.4/configure.in.make_imap4_optional	2006-01-09 17:24:10.000000000 -0500
++++ evolution-data-server-1.5.4/configure.in	2006-01-09 17:24:12.000000000 -0500
 @@ -807,6 +807,16 @@
  dnl **************************************************
  dnl New IMAP code support.
@@ -17,8 +17,17 @@
  AC_ARG_ENABLE(imapp, 
  [  --enable-imapp=[no/yes]      Attempt to compile alternative, incomplete, very unsupported IMAPv4r1 code],,enable_imapp=no)
  if test "x$enable_imapp" = "xyes"; then
---- evolution-data-server-1.5.4/camel/providers/Makefile.am.make_imap4_optional	2006-01-09 14:23:30.000000000 -0500
-+++ evolution-data-server-1.5.4/camel/providers/Makefile.am	2006-01-09 14:24:01.000000000 -0500
+@@ -1093,8 +1103,6 @@
+ dnl CFLAGS and LIBS and stuff
+ dnl *************************
+ 
+-GNOME_COMPILE_WARNINGS(yes)
+-CFLAGS="$CFLAGS $WARN_CFLAGS"
+ case $CFLAGS in
+ *-Wall*)
+ 	# Turn off the annoying "comparison between signed and unsigned"
+--- evolution-data-server-1.5.4/camel/providers/Makefile.am.make_imap4_optional	2005-12-08 02:54:16.000000000 -0500
++++ evolution-data-server-1.5.4/camel/providers/Makefile.am	2006-01-09 17:24:12.000000000 -0500
 @@ -1,5 +1,9 @@
  ## Process this file with automake to produce Makefile.in
  


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- evolution-data-server.spec	9 Jan 2006 21:56:12 -0000	1.78
+++ evolution-data-server.spec	9 Jan 2006 22:31:25 -0000	1.79
@@ -25,7 +25,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.5.4
-Release: 3
+Release: 4
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -122,7 +122,7 @@
 %patch103 -p1 -b .validatehelo
 %patch200 -p0 -b .fix-uid-leak
 %patch201 -p0 -b .fix-comp-ref-leak
-%patch300 -p1 -b .make-imap4-optional
+%patch300 -p1 -b .make_imap4_optional
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -290,6 +290,10 @@
 
 
 %changelog
+* Mon Jan  9 2006 David Malcolm <dmalcolm at cassandra.boston.redhat.com> - 1.5.4-4
+- updated patch 300 to remove usage of GNOME_COMPILE_WARNINGS from configure.in
+  (since gnome-common might not be available when we rerun the autotools)
+
 * Mon Jan  9 2006 David Malcolm <dmalcolm at redhat.com> - 1.5.4-3
 - added patch to make the "imap4"/"IMAP4rev1" backend optional; disable it in 
   our packages; re-run automake since we have touched various Makefile.am