rpms/evolution-connector/devel .cvsignore, 1.40, 1.41 evolution-connector.spec, 1.82, 1.83 evolution-exchange-2.8.1-warn-unused-variable.patch, 1.1, 1.2 sources, 1.40, 1.41 evolution-exchange-2.8.1-bump-requirements.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Dec 4 21:58:32 UTC 2006


Author: mbarnes

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5324

Modified Files:
	.cvsignore evolution-connector.spec 
	evolution-exchange-2.8.1-warn-unused-variable.patch sources 
Removed Files:
	evolution-exchange-2.8.1-bump-requirements.patch 
Log Message:

* Mon Dec 04 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-1.fc7
- Update to 2.9.3
- Require evolution-data-server-1.9.3.
- Add %post section to install new schemas file.
- Remove evolution-exchange-2.8.1-bump-requirements.patch (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	16 Oct 2006 19:00:28 -0000	1.40
+++ .cvsignore	4 Dec 2006 21:58:30 -0000	1.41
@@ -1 +1 @@
-evolution-exchange-2.8.1.tar.bz2
+evolution-exchange-2.9.3.tar.bz2


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- evolution-connector.spec	24 Oct 2006 20:24:40 -0000	1.82
+++ evolution-connector.spec	4 Dec 2006 21:58:30 -0000	1.83
@@ -1,5 +1,5 @@
 %define evo_version 2.9.1
-%define eds_version 1.9.1
+%define eds_version 1.9.3
 %define libsoup_version 2.2.6.1
 
 %define eds_major 1.2
@@ -21,8 +21,8 @@
 ### Abstract ###
 
 Name: evolution-connector
-Version: 2.8.1
-Release: 2%{?dist}
+Version: 2.9.3
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -45,9 +45,6 @@
 # Gnome.org bug #360240
 Patch15: evolution-exchange-2.8.1-warn-unused-variable.patch
 
-# Build against Evo 2.10 / EDS 1.10
-Patch16: evolution-exchange-2.8.1-bump-requirements.patch
-
 ### Dependencies ###
 
 Requires: evolution >= %{evo_version}
@@ -83,7 +80,6 @@
 %patch13 -p1 -b .no_gnome_common
 %patch14 -p1 -b .deprecated-glib
 %patch15 -p1 -b .warn-unused-variable
-%patch16 -p1 -b .bump-requirements
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -132,6 +128,10 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-%{eds_major}/camel-providers/*.a
 %find_lang evolution-exchange-%{evo_major}
 
+%post
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas > /dev/null
+
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
@@ -150,8 +150,15 @@
 %{_datadir}/evolution-exchange/%{evo_major}/glade/*.glade
 %{_datadir}/evolution-exchange/%{evo_major}/images/*.png
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
+%{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Mon Dec 04 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-1.fc7
+- Update to 2.9.3
+- Require evolution-data-server-1.9.3.
+- Add %post section to install new schemas file.
+- Remove evolution-exchange-2.8.1-bump-requirements.patch (fixed upstream).
+
 * Tue Oct 24 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.1-2.fc7
 - Add patch and rebuild for next Evolution development cycle.
 

evolution-exchange-2.8.1-warn-unused-variable.patch:
 e-cal-backend-exchange-calendar.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

Index: evolution-exchange-2.8.1-warn-unused-variable.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-exchange-2.8.1-warn-unused-variable.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-exchange-2.8.1-warn-unused-variable.patch	16 Oct 2006 19:00:28 -0000	1.1
+++ evolution-exchange-2.8.1-warn-unused-variable.patch	4 Dec 2006 21:58:30 -0000	1.2
@@ -1,13 +1,3 @@
---- evolution-exchange-2.8.1/addressbook/e-book-backend-gal.c.warn-unused-variable	2006-01-27 04:52:15.000000000 -0500
-+++ evolution-exchange-2.8.1/addressbook/e-book-backend-gal.c	2006-10-08 21:55:20.000000000 -0400
-@@ -1712,7 +1712,6 @@
- {
- 	EBookBackendGAL *be = E_BOOK_BACKEND_GAL (backend);
- 	EBookBackendGALPrivate *bepriv;
--	ExchangeAccountResult result;
- 
- 	bepriv = be->priv;
- 
 --- evolution-exchange-2.8.1/calendar/e-cal-backend-exchange-calendar.c.warn-unused-variable	2006-10-02 21:37:57.000000000 -0400
 +++ evolution-exchange-2.8.1/calendar/e-cal-backend-exchange-calendar.c	2006-10-08 21:55:20.000000000 -0400
 @@ -1026,7 +1026,6 @@


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	16 Oct 2006 19:00:28 -0000	1.40
+++ sources	4 Dec 2006 21:58:30 -0000	1.41
@@ -1 +1 @@
-f4dfdfed72eb705adefbaff0b575fb10  evolution-exchange-2.8.1.tar.bz2
+23f126c6e185b2c6571348c19c786b4c  evolution-exchange-2.9.3.tar.bz2


--- evolution-exchange-2.8.1-bump-requirements.patch DELETED ---




More information about the fedora-cvs-commits mailing list