rpms/evolution-exchange/devel evolution-exchange-2.11.5-version-checks.patch, NONE, 1.1 evolution-exchange.spec, 1.3, 1.4

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9445

Modified Files:
	evolution-exchange.spec 
Added Files:
	evolution-exchange-2.11.5-version-checks.patch 
Log Message:

* Fri Jul 27 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.5-2.fc8
- Add patch for GNOME bug #380534 (clarify version requirements).


evolution-exchange-2.11.5-version-checks.patch:

--- NEW FILE evolution-exchange-2.11.5-version-checks.patch ---
--- evolution-exchange-2.11.5/configure.in.version-checks	2007-07-27 09:50:59.000000000 -0400
+++ evolution-exchange-2.11.5/configure.in	2007-07-27 09:52:12.000000000 -0400
@@ -5,7 +5,13 @@ AC_INIT(evolution-exchange, 2.11.5, http
 AC_CONFIG_SRCDIR(storage)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
-
+# Required Package Versions
+m4_define([gtk_minimum_version], [2.10.0])
+m4_define([gconf_minimum_version], [2.0.0])             # XXX Just a Guess
+m4_define([libbonobo_minimum_version], [2.0.0])         # XXX Just a Guess
+m4_define([libglade_minimum_version], [2.0.0])          # XXX Just a Guess
+m4_define([libgnomeui_minimum_version], [2.0.0])        # XXX Just a Guess
+m4_define([libxml_minimum_version], [2.0.0])            # XXX Just a Guess
 
 AM_CONFIG_HEADER(config.h)
 
@@ -91,6 +97,15 @@ AC_MSG_RESULT([$os_win32])
 AC_SUBST(NO_UNDEFINED)
 AC_SUBST(SOCKET_LIBS)
 
+# Check for base dependencies early.
+PKG_CHECK_MODULES(GNOME_PLATFORM,
+        [gtk+-2.0 >= gtk_minimum_version
+         gconf-2.0 >= gconf_minimum_version
+         libbonobo-2.0 >= libbonobo_minimum_version
+         libglade-2.0 >= libglade_minimum_version
+         libgnomeui-2.0 >= libgnomeui_minimum_version
+         libxml-2.0 >= libxml_minimum_version])
+
 dnl *************************
 dnl CFLAGS and LIBS and stuff
 dnl *************************
@@ -175,11 +190,11 @@ else
 	LIBSOUP_VERSION=2.2
 fi
 
-PKG_CHECK_MODULES(EXCHANGE_STORAGE, evolution-shell evolution-plugin libedataserverui-$EDS_API_VERSION libedata-book-$EDS_API_VERSION libedata-cal-$EDS_API_VERSION libsoup-$LIBSOUP_VERSION libglade-2.0 libgnomeui-2.0 libgnomeprint-2.2 >= 2.2.0 camel-provider-$EDS_API_VERSION)
+PKG_CHECK_MODULES(EXCHANGE_STORAGE, evolution-shell evolution-plugin libedataserverui-$EDS_API_VERSION libedata-book-$EDS_API_VERSION libedata-cal-$EDS_API_VERSION libsoup-$LIBSOUP_VERSION libglade-2.0 camel-provider-$EDS_API_VERSION)
 AC_SUBST(EXCHANGE_STORAGE_CFLAGS)
 AC_SUBST(EXCHANGE_STORAGE_LIBS)
 
-PKG_CHECK_MODULES(LIBEXCHANGE, libsoup-$LIBSOUP_VERSION evolution-shell libedataserverui-$EDS_API_VERSION libexchange-storage-$EDS_API_VERSION libbonobo-2.0 libxml-2.0 gconf-2.0)
+PKG_CHECK_MODULES(LIBEXCHANGE, libsoup-$LIBSOUP_VERSION evolution-shell libedataserverui-$EDS_API_VERSION libexchange-storage-$EDS_API_VERSION)
 AC_SUBST(LIBEXCHANGE_CFLAGS)
 AC_SUBST(LIBEXCHANGE_LIBS)
 


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-exchange.spec	9 Jul 2007 20:36:26 -0000	1.3
+++ evolution-exchange.spec	27 Jul 2007 14:01:54 -0000	1.4
@@ -24,7 +24,7 @@
 
 Name: evolution-exchange
 Version: 2.11.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -53,6 +53,9 @@
 # Fix newly introduced warnings in 2.11.5.
 Patch16: evolution-exchange-2.11.5-fix-warnings.patch
 
+# GNOME bug #380534
+Patch17: evolution-exchange-2.11.5-version-checks.patch
+
 ### Dependencies ###
 
 Requires: db4
@@ -93,6 +96,7 @@
 %patch14 -p1 -b .fix-library-order
 %patch15 -p1 -b .e-passwords
 %patch16 -p1 -b .fix-warnings
+%patch17 -p1 -b .version-checks
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -126,7 +130,7 @@
 	-Werror"
 %endif
 
-# Regenerate configure to pick up acinclude.m4 changes
+# Regenerate configure to pick up acinclude.m4 changes.
 autoreconf --force
 
 %configure \
@@ -167,6 +171,9 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Fri Jul 27 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.5-2.fc8
+- Add patch for GNOME bug #380534 (clarify version requirements).
+
 * Mon Jul 09 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.5-1.fc8
 - Update to 2.11.5