rpms/evolution/devel evolution.spec, 1.368, 1.369 evolution-2.25.2-broken-account-uris.patch, 1.1, NONE evolution-2.25.3.1-libgweather.patch, 1.1, NONE evolution-2.5.4-fix-conduits.patch, 1.1, NONE evolution-2.7.1-no-gnome-common.patch, 1.6, NONE

[Matthew Barnes]

Author: mbarnes

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

Modified Files:
	evolution.spec 
Removed Files:
	evolution-2.25.2-broken-account-uris.patch 
	evolution-2.25.3.1-libgweather.patch 
	evolution-2.5.4-fix-conduits.patch 
	evolution-2.7.1-no-gnome-common.patch 
Log Message:

* Fri Feb 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.90-2.fc11
- Update BuildRoot, License, Source and URL tags.
- Require gnome-common so we don't have to patch it out.



Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -r1.368 -r1.369
--- evolution.spec	2 Feb 2009 18:36:06 -0000	1.368
+++ evolution.spec	6 Feb 2009 05:59:41 -0000	1.369
@@ -45,13 +45,13 @@
 
 Name: evolution
 Version: 2.25.90
-Release: 1%{?dist}
-License: GPLv2 and GFDL
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
-URL: http://www.gnome.org/projects/evolution/
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Source: evolution-%{version}.tar.bz2
+License: GPLv2+ and GFDL
+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
 
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
@@ -60,26 +60,13 @@
 # bad hack
 Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
 
-# Patches for conduits, based upon
-# rh-161817-attach-116019-conduit_pilot_link_updates.diff
-# (the latter patch was originally by Mark G. Adams):
-# Patch11: evolution-2.5.4-fix-conduits.patch
-
-# Move .conduit files from share to lib (for the sake of multilib)
+# Move .conduit files from share to lib (for the sake of multilib).
 # This patch effects other parts of evolution.spec and so is necessary
 # for a successful build.
-Patch12: evolution-2.5.4-fix-conduit-dir.patch
-
-# Remove gnome-common macros from configure.in.
-# We do not ship gnome-common (or at least we're not supposed to).
-Patch13: evolution-2.7.1-no-gnome-common.patch
+Patch11: evolution-2.5.4-fix-conduit-dir.patch
 
 # RH bug #176400
-Patch14: evolution-2.9.1-im-context-reset.patch
-
-# Back off the bleeding edge libgweather requirement.
-# We can get by with libgweather-2.25.2 for now.
-Patch15: evolution-2.25.3.1-libgweather.patch
+Patch12: evolution-2.9.1-im-context-reset.patch
 
 ## Dependencies ###
 
@@ -109,6 +96,7 @@
 BuildRequires: flex
 BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
+BuildRequires: gnome-common
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: gnutls-devel
 BuildRequires: gtk-doc
@@ -232,11 +220,8 @@
 %prep
 %setup -q -n evolution-%{version}
 %patch10 -p1 -b .ldaphack
-#patch11 -p1 -b .fix-conduits  # leave commented
-%patch12 -p1 -b .fix-conduit-dir
-%patch13 -p1 -b .no-gnome-common
-%patch14 -p1 -b .im-context-reset
-%patch15 -p1 -b .libgweather
+%patch11 -p1 -b .fix-conduit-dir
+%patch12 -p1 -b .im-context-reset
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -703,6 +688,10 @@
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
 
 %changelog
+* Fri Feb 06 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.90-2.fc11
+- Update BuildRoot, License, Source and URL tags.
+- Require gnome-common so we don't have to patch it out.
+
 * Mon Feb 02 2009 Matthew Barnes <mbarnes at redhat.com> - 2.25.90-1.fc11
 - Update to 2.25.90
 


--- evolution-2.25.2-broken-account-uris.patch DELETED ---


--- evolution-2.25.3.1-libgweather.patch DELETED ---


--- evolution-2.5.4-fix-conduits.patch DELETED ---


--- evolution-2.7.1-no-gnome-common.patch DELETED ---