From bd08cc4467b03af2f05d5736a86b6ffa98a101d7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 17 Jan 2008 17:30:33 +0000 Subject: [PATCH] - Rename evolution-1.4.4-ldap-x86_64-hack.patch to avoid namespace collision with similarly named patch in evolution (RH bug #395551). --- ... => evolution-data-server-1.4.4-ldap-x86_64-hack.patch | 0 evolution-data-server.spec | 8 ++++++-- 2 files changed, 6 insertions(+), 2 deletions(-) rename evolution-1.4.4-ldap-x86_64-hack.patch => evolution-data-server-1.4.4-ldap-x86_64-hack.patch (100%) diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-data-server-1.4.4-ldap-x86_64-hack.patch similarity index 100% rename from evolution-1.4.4-ldap-x86_64-hack.patch rename to evolution-data-server-1.4.4-ldap-x86_64-hack.patch diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 341923d..c889122 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -27,7 +27,7 @@ Name: evolution-data-server Version: 2.21.5 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries Summary: Backend data server for Evolution @@ -37,7 +37,7 @@ Source: %{name}-%{version}.tar.bz2 ### Patches ### -Patch10: evolution-1.4.4-ldap-x86_64-hack.patch +Patch10: evolution-data-server-1.4.4-ldap-x86_64-hack.patch # Remove gnome-common macros from configure.in. # We do not ship gnome-common (or at least we're not supposed to). @@ -379,6 +379,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libedataserverui %changelog +* Thu Jan 17 2008 Matthew Barnes - 2.21.5-3.fc9 +- Rename evolution-1.4.4-ldap-x86_64-hack.patch to avoid namespace + collision with similarly named patch in evolution (RH bug #395551). + * Wed Jan 16 2008 Matthew Barnes - 2.21.5-2.fc9 - Add patch for GNOME bug #509644 (password dialog breakage). - Remove patch for RH bug #384741 (fixed upstream).