rpms/evolution-exchange/F-8 evolution-exchange.spec, 1.13, 1.14 evolution-connector-2.11.2-deprecated-eds.patch, 1.1, NONE evolution-exchange-2.11.4-e-passwords.patch, 1.1, NONE evolution-exchange-2.5.3-fix-marshaller.patch, 1.1, NONE

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26883

Modified Files:
	evolution-exchange.spec 
Removed Files:
	evolution-connector-2.11.2-deprecated-eds.patch 
	evolution-exchange-2.11.4-e-passwords.patch 
	evolution-exchange-2.5.3-fix-marshaller.patch 
Log Message:

* Sun Nov 04 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-2.fc8
- Remove libgnomeprint22 requirement.
- Remove obsolete patches.



Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/F-8/evolution-exchange.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- evolution-exchange.spec	15 Oct 2007 17:47:50 -0000	1.13
+++ evolution-exchange.spec	4 Nov 2007 18:22:03 -0000	1.14
@@ -1,6 +1,5 @@
 %define evo_version 2.11.0
 %define eds_version 1.11.0
-%define libgnomeprint22_version 2.2.0
 %define intltool_version 0.35.5
 %define libsoup_version 2.2.6.1
 
@@ -24,7 +23,7 @@
 
 Name: evolution-exchange
 Version: 2.12.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: Evolution plugin to interact with MS Exchange Server
@@ -38,24 +37,19 @@
 ### Patches ###
 
 Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch
-Patch12: evolution-exchange-2.5.3-fix-marshaller.patch
 
 # Remove gnome-common macros from configure.in.
 # We do not ship gnome-common (or at least we're not supposed to).
-Patch13: evolution-exchange-2.7.2-no_gnome_common.patch
+Patch12: evolution-exchange-2.7.2-no_gnome_common.patch
 
 # GNOME bug #443022
-Patch14: evolution-exchange-2.11.2-fix-library-order.patch
-
-# Remove deprecated e_passwords_shutdown().
-Patch15: evolution-exchange-2.11.4-e-passwords.patch
+Patch13: evolution-exchange-2.11.2-fix-library-order.patch
 
 ### Dependencies ###
 
 Requires: db4
 Requires: evolution >= %{evo_version}
 Requires: gnutls
-Requires: libgnomeprint22 >= %{libgnomeprint22_version}
 Requires: libsoup >= %{libsoup_version}
 Requires: openldap
 
@@ -71,7 +65,6 @@
 BuildRequires: gnutls
 BuildRequires: gtk-doc
 BuildRequires: intltool >= %{intltool_version}
-BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version}
 BuildRequires: libsoup-devel >= %{libsoup_version}
 BuildRequires: libtool >= 1.5
 BuildRequires: openldap-evolution-devel
@@ -85,10 +78,8 @@
 %setup -q -n evolution-exchange-%{version}
 
 %patch11 -p1 -b .fix-64bit-acinclude.m4
-#%patch12 -p1 -b .fix-marshaller
-%patch13 -p1 -b .no_gnome_common
-%patch14 -p1 -b .fix-library-order
-%patch15 -p1 -b .e-passwords
+%patch12 -p1 -b .no_gnome_common
+%patch13 -p1 -b .fix-library-order
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -162,6 +153,10 @@
 %{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
 
 %changelog
+* Sun Nov 04 2007 Matthew Barnes <mbarnes at redhat.com> - 2.12.1-2.fc8
+- Remove libgnomeprint22 requirement.
+- Remove obsolete patches.
+
 * Mon Oct 15 2007 Milan Crha <mcrha at redhat.com> - 2.12.1-1.fc8
 - Update to 2.12.1
 - Removed evolution-exchange-2.11.92-compilation-breakage.patch (fixed upstream).


--- evolution-connector-2.11.2-deprecated-eds.patch DELETED ---


--- evolution-exchange-2.11.4-e-passwords.patch DELETED ---


--- evolution-exchange-2.5.3-fix-marshaller.patch DELETED ---