rpms/evolution-exchange/devel evolution-exchange-2.29.2-gettext-package-voodoo.patch, NONE, 1.1 evolution-exchange.spec, 1.77, 1.78

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32049

Modified Files:
	evolution-exchange.spec 
Added Files:
	evolution-exchange-2.29.2-gettext-package-voodoo.patch 
Log Message:

* Mon Nov 17 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.2-1.fc13
- Update to 2.29.2
- Add patch to work around intltool issue.


evolution-exchange-2.29.2-gettext-package-voodoo.patch:
 configure.ac |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

--- NEW FILE evolution-exchange-2.29.2-gettext-package-voodoo.patch ---
diff -up evolution-exchange-2.29.2/configure.ac.gettext-package-voodoo evolution-exchange-2.29.2/configure.ac
--- evolution-exchange-2.29.2/configure.ac.gettext-package-voodoo	2009-11-14 16:51:17.000000000 -0500
+++ evolution-exchange-2.29.2/configure.ac	2009-11-17 20:26:32.171257761 -0500
@@ -21,12 +21,14 @@ m4_define([gconf_minimum_version], [2.0.
 m4_define([libxml_minimum_version], [2.0.0])		dnl XXX Just a Guess
 m4_define([libsoup_minimum_version], [2.3.0])
 
+dnl *********************************************************************
+dnl Update these for every new development release of Evolution-Exchange.
+dnl These numbers actually correspond to the next stable release number.
+dnl Note, this is set the way it is so that GETTEXT_PACKAGE will be
+dnl parsed correctly.
 dnl ******************************************************************
-dnl Update these for every new development release of evolution. These
-dnl numbers actually correspond to the next stable release number.
-dnl ******************************************************************
-EVOLUTION_API_VERSION=2.30
-EDS_BASE_VERSION=2.30
+BASE_VERSION=2.30
+m4_define([base_version], [2.30])
 
 dnl **********************
 dnl Compiler Warning Flags
@@ -112,7 +114,7 @@ dnl ***************
 IT_PROG_INTLTOOL([0.35.5])
 AM_GLIB_GNU_GETTEXT
 
-GETTEXT_PACKAGE=evolution-exchange-${BASE_VERSION}
+GETTEXT_PACKAGE=evolution-exchange-$BASE_VERSION
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
 
@@ -187,10 +189,7 @@ if test -z "$EVOLUTION_VERSION"; then
 fi
 AC_SUBST(EVOLUTION_VERSION)
 
-EVOLUTION_BASE_VERSION=$EVOLUTION_API_VERSION
-AC_DEFINE_UNQUOTED(EVOLUTION_BASE_VERSION, "$EVOLUTION_BASE_VERSION", Evolution version)
-
-BASE_VERSION=$EVOLUTION_API_VERSION
+AC_SUBST([BASE_VERSION], [base_version])
 AC_DEFINE_UNQUOTED(BASE_VERSION, "$BASE_VERSION", Connector base version)
 
 plugindir="`$PKG_CONFIG --variable=plugindir evolution-plugin`"


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- evolution-exchange.spec	17 Nov 2009 16:46:32 -0000	1.77
+++ evolution-exchange.spec	18 Nov 2009 01:27:52 -0000	1.78
@@ -23,7 +23,7 @@ Summary: Evolution plugin to interact wi
 License: GPLv2+
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
 
 Provides: evolution-connector = %{version}-%{release}
 Obsoletes: evolution-connector < %{version}-%{release}
@@ -32,6 +32,9 @@ Obsoletes: evolution-connector < %{versi
 
 Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch
 
+# Temporary workaround for 2.29.2
+Patch12: evolution-exchange-2.29.2-gettext-package-voodoo.patch
+
 ### Dependencies ###
 
 Requires: gnutls
@@ -62,6 +65,7 @@ Microsoft Exchange Server.
 %setup -q -n evolution-exchange-%{version}
 
 %patch11 -p1 -b .fix-64bit-acinclude.m4
+%patch12 -p1 -b .gettext-package-voodoo
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -122,6 +126,7 @@ gconftool-2 --makefile-install-rule %{_s
 %changelog
 * Mon Nov 17 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.2-1.fc13
 - Update to 2.29.2
+- Add patch to work around intltool issue.
 
 * Tue Oct 27 2009 Matthew Barnes <mbarnes at redhat.com> - 2.29.1-1.fc13
 - Update to 2.29.1