rpms/evolution-connector/F-7 evolution-exchange-2.10.3-version-checks.patch, NONE, 1.1 evolution-connector.spec, 1.104, 1.105

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-connector/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1797

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

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


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

--- NEW FILE evolution-exchange-2.10.3-version-checks.patch ---
--- evolution-exchange-2.10.3/configure.in.version-checks	2007-07-27 09:54:03.000000000 -0400
+++ evolution-exchange-2.10.3/configure.in	2007-07-27 09:56:52.000000000 -0400
@@ -5,7 +5,13 @@ AC_INIT(evolution-exchange, 2.10.3, 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_BASE_VERSION evolution-plugin-$EVOLUTION_BASE_VERSION 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_BASE_VERSION evolution-plugin-$EVOLUTION_BASE_VERSION 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-$EVOLUTION_BASE_VERSION 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-$EVOLUTION_BASE_VERSION libedataserverui-$EDS_API_VERSION libexchange-storage-$EDS_API_VERSION)
 AC_SUBST(LIBEXCHANGE_CFLAGS)
 AC_SUBST(LIBEXCHANGE_LIBS)
 


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-connector/F-7/evolution-connector.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- evolution-connector.spec	2 Jul 2007 18:07:27 -0000	1.104
+++ evolution-connector.spec	27 Jul 2007 14:00:50 -0000	1.105
@@ -24,7 +24,7 @@
 
 Name: evolution-connector
 Version: 2.10.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -47,6 +47,9 @@
 # List static libraries in the correct order.
 Patch15: evolution-exchange-2.10.2-fix-library-order.patch
 
+# GNOME bug #380534
+Patch16: evolution-exchange-2.10.3-version-checks.patch
+
 ### Dependencies ###
 
 Requires: db4
@@ -86,6 +89,7 @@
 %patch13 -p1 -b .no_gnome_common
 %patch14 -p1 -b .fix-compiler-warnings
 %patch15 -p1 -b .fix-library-order
+%patch16 -p1 -b .version-checks
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -163,7 +167,10 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
-* Mon Jul 02 2007 Matthew Barnes <mbarnes at Redhat.com> - 2.10.3-1.fc7
+* Fri Jul 27 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.3-2.fc7
+- Add patch for GNOME bug #380534 (clarify version requirements).
+
+* Mon Jul 02 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.3-1.fc7
 - Update to 2.10.3
 
 * Fri Jun 01 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.2-2.fc7