rpms/evolution-data-server/devel evolution-data-server-1.11.5-version-checks.patch, NONE, 1.1 evolution-data-server.spec, 1.173, 1.174
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Fri Jul 27 14:00:35 UTC 2007
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1226
Modified Files:
evolution-data-server.spec
Added Files:
evolution-data-server-1.11.5-version-checks.patch
Log Message:
* Fri Jul 27 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.5-3.fc8
- Add patch for GNOME bug #380534 (clarify version requirements).
evolution-data-server-1.11.5-version-checks.patch:
--- NEW FILE evolution-data-server-1.11.5-version-checks.patch ---
--- evolution-data-server-1.11.5/configure.in.version-checks 2007-07-27 09:16:57.000000000 -0400
+++ evolution-data-server-1.11.5/configure.in 2007-07-27 09:31:27.000000000 -0400
@@ -12,6 +12,16 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PAC
AM_CONFIG_HEADER(config.h)
+# Required Package Versions
+m4_define([gtk_minimum_version], [2.10.0])
+m4_define([ORBit_minimum_version], [2.9.8])
+m4_define([gnome_vfs_minimum_version], [2.4.0])
+m4_define([libbonobo_minimum_version], [2.4.2])
+m4_define([gconf_minimum_version], [2.0.0]) # XXX Just a Guess
+m4_define([libglade_minimum_version], [2.0.0]) # XXX Just a Guess
+m4_define([libgnome_minimum_version], [2.0.0]) # XXX Just a Guess
+m4_define([libxml_minimum_version], [2.0.0]) # XXX Just a Guess
+
dnl *************************************************************************************************
dnl Base Version
dnl
@@ -180,6 +190,17 @@ AC_CHECK_FUNCS(fsync strptime strtok_r)
dnl alloca()
AC_CHECK_HEADERS(alloca.h)
+# Check for base dependencies early.
+PKG_CHECK_MODULES(GNOME_PLATFORM,
+ [gtk+-2.0 >= gtk_minimum_version
+ ORBit-2.0 >= ORBit_minimum_version
+ gnome-vfs-2.0 >= gnome_vfs_minimum_version
+ libbonobo-2.0 >= libbonobo_minimum_version
+ gconf-2.0 >= gconf_minimum_version
+ libglade-2.0 >= libglade_minimum_version
+ libgnome-2.0 >= libgnome_minimum_version
+ libxml-2.0 >= libxml_minimum_version])
+
dnl **************************************************
dnl * regex checking
dnl **************************************************
@@ -1264,12 +1285,10 @@ msg_no_ntlm="no"
msg_exchange="yes"
fi # Win32
-GLIB_REQUIRED="2.10.0"
-LIBBONOBO_REQUIRED="2.4.2"
-ORBIT_REQUIRED="2.9.8"
-
-AC_SUBST(GLIB_REQUIRED)
+LIBBONOBO_REQUIRED=libbonobo_minimum_version
AC_SUBST(LIBBONOBO_REQUIRED)
+
+ORBIT_REQUIRED=ORBit_minimum_version
AC_SUBST(ORBIT_REQUIRED)
dnl *******************
@@ -1318,7 +1337,7 @@ case $CFLAGS in
;;
esac
-PKG_CHECK_MODULES(ORBIT, ORBit-2.0 >= 2.9.8)
+PKG_CHECK_MODULES(ORBIT, ORBit-2.0 >= ORBit_minimum_version)
ORBIT_IDL=`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`
AC_SUBST(ORBIT_CFLAGS)
AC_SUBST(ORBIT_LIBS)
@@ -1348,13 +1367,13 @@ dnl ************************************
dnl --- libedataserver and libedataserverui flags
-E_DATA_SERVER_DEPS="libxml-2.0 gobject-2.0 >= $GLIB_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED gconf-2.0 $mozilla_nspr"
+E_DATA_SERVER_DEPS="libxml-2.0 libbonobo-2.0 gconf-2.0 $mozilla_nspr"
EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
AC_SUBST(E_DATA_SERVER_CFLAGS)
AC_SUBST(E_DATA_SERVER_LIBS)
-E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 gconf-2.0 libgnome-2.0 gnome-vfs-2.0 $GNOME_KEYRING_REQUIREMENT"
+E_DATA_SERVER_UI_DEPS="gtk+-2.0 libglade-2.0 libgnome-2.0 gnome-vfs-2.0 $GNOME_KEYRING_REQUIREMENT"
EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, $THREADS_CFLAGS, $THREADS_LIBS)
AC_SUBST(E_DATA_SERVER_UI_CFLAGS)
@@ -1362,7 +1381,7 @@ AC_SUBST(E_DATA_SERVER_UI_LIBS)
dnl --- evolution-addressbook flags
-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0"
+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 libgnome-2.0 gnome-vfs-2.0"
EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -1370,7 +1389,7 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
dnl --- evolution-calendar flags
if test "x${enable_calendar}" = "xyes"; then
- EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0"
+ EVOLUTION_CALENDAR_DEPS="libxml-2.0 libgnome-2.0 gnome-vfs-2.0"
EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
@@ -1379,7 +1398,7 @@ fi
dnl --- factory flags
-E_FACTORY_DEPS="gobject-2.0 >= $GLIB_REQUIRED libbonobo-2.0 >= $LIBBONOBO_REQUIRED gconf-2.0 gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr"
+E_FACTORY_DEPS="gnome-vfs-2.0 libgnome-2.0 $mozilla_nspr"
EVO_SET_COMPILE_FLAGS(E_FACTORY, $E_FACTORY_DEPS, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS)
AC_SUBST(E_FACTORY_CFLAGS)
@@ -1430,7 +1449,7 @@ AC_CACHE_CHECK([if large files (>2 GB) a
])
])
-EVO_SET_COMPILE_FLAGS(CAMEL, gthread-2.0 gmodule-2.0 gobject-2.0 $mozilla_nss gnome-vfs-2.0,
+EVO_SET_COMPILE_FLAGS(CAMEL, $mozilla_nss gnome-vfs-2.0,
$THREADS_CFLAGS $KRB4_CFLAGS $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS,
-lz $THREADS_LIBS $KRB4_LDFLAGS $KRB5_LDFLAGS $MANUAL_NSS_LIBS)
AC_SUBST(CAMEL_CFLAGS)
Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.173
retrieving revision 1.174
diff -u -r1.173 -r1.174
--- evolution-data-server.spec 17 Jul 2007 15:21:30 -0000 1.173
+++ evolution-data-server.spec 27 Jul 2007 14:00:01 -0000 1.174
@@ -26,7 +26,7 @@
Name: evolution-data-server
Version: 1.11.5
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPL
Group: System Environment/Libraries
Summary: Backend data server for Evolution
@@ -66,6 +66,9 @@
# RH bug #243296
Patch21: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
+# GNOME bug #380534
+Patch22: evolution-data-server-1.11.5-version-checks.patch
+
### Dependencies ###
Requires: GConf2
@@ -155,6 +158,7 @@
%patch19 -p1 -b .camel-folder-symmary-crash
%patch20 -p1 -b .camel-certdb-nss-cert-get
%patch21 -p1 -b .fix-64bit-acinclude
+%patch22 -p1 -b .version-checks
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -387,6 +391,9 @@
%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
%changelog
+* Fri Jul 27 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.5-3.fc8
+- Add patch for GNOME bug #380534 (clarify version requirements).
+
* Tue Jul 17 2007 Matthew Barnes <mbarnes at redhat.com> - 1.11.5-2.fc8
- Add patch for RH bug #243296 (fix LDAP configuration).
More information about the scm-commits
mailing list