From 2d659488721bb32826bef383148bc3e386910cc3 Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@fedoraproject.org>
Date: Fri, 16 Dec 2005 04:03:52 +0000
Subject: [PATCH] - Require nspr and nss instead of mozilla-nspr and
 mozilla-nss - Update no-gnome-common patch to work with standalone nss
 package

---
 evolution.spec | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index d7e8e35..257d836 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 
 Name: evolution
 Version: 2.5.2
-Release: 1.1
+Release: 2
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -86,7 +86,7 @@ Patch800: evolution-2.5.2-fix-conduits.patch
 Patch802: evolution-2.2.2-fix-conduit-dir.patch
 
 # Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools):
-Patch803: evolution-2.2.2-no-gnome-common.patch
+Patch803: evolution-2.5.2-no-gnome-common.patch
 
 Patch804: evolution-2.4.1-fix-missing-declarations.patch
 
@@ -131,8 +131,8 @@ BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: gtk-doc
 
 %if %{use_mozilla_nss}
-BuildRequires: mozilla-nspr-devel
-BuildRequires: mozilla-nss-devel
+BuildRequires: nspr-devel
+BuildRequires: nss-devel
 %else
 BuildRequires: openssl-devel
 %endif
@@ -254,7 +254,7 @@ mkdir -p krb5-fakeprefix/%{_lib}
 %endif
 
 %if %{use_mozilla_nss}
-if ! pkg-config --exists mozilla-nss; then 
+if ! pkg-config --exists nss; then 
   echo "Unable to find suitable version of mozilla nss to use!"
   exit 1
 fi
@@ -486,6 +486,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Thu Dec 15 2005 Christopher Aillon <caillon@redhat.com> 2.5.2-2
+- Require nspr and nss instead of mozilla-nspr and mozilla-nss
+- Update no-gnome-common patch to work with standalone nss package
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt