From 095542230a47d27622fd0bef03e0ba0f105a2d8e Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 04:41:55 +0000
Subject: [PATCH] auto-import changelog data from evolution-1.5.90-5.src.rpm
 Thu Jul 08 2004 Jeremy Katz <katzj@redhat.com> - 1.5.90-5 - use mozilla 1.7
 on platforms where it's available - check to make sure the appropriate
 mozilla headers exist if using mozilla     nss for ssl or fail the build Thu
 Jul 08 2004 David Malcolm <dmalcolm@redhat.com> - rebuilt

---
 evolution.spec | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 521cff6..c78c2d7 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -11,6 +11,11 @@ ExcludeArch: ppc64
 %define orbit2_version 2.9.8
 
 %if %{use_mozilla_nss}
+%define mozilla_version 1.7
+%endif
+
+# FIXME!!!  s390/s390x don't have mozilla 1.7 yet
+%ifarch s390 s390x
 %define mozilla_version 1.6
 %endif
 
@@ -26,7 +31,7 @@ ExcludeArch: ppc64
 
 Name: evolution
 Version: 1.5.90
-Release: 3
+Release: 5
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -193,6 +198,13 @@ mkdir -p krb5-fakeprefix/%{_lib}
 %define ssl_flags --enable-openssl=yes
 %endif
 
+%if %{use_mozilla_nss}
+if [ ! -f /usr/include/mozilla-%{mozilla_version}/nspr/nspr.h ]; then
+  echo "Unable to find suitable version of mozilla nss to use!"
+  exit 1
+fi
+%endif
+
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
 CFLAGS="$RPM_OPT_FLAGS -fPIC -I%{_includedir}/et"; export CFLAGS
 %if ! %{use_mozilla_nss}
@@ -300,6 +312,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*/*.a
 
 %changelog
+* Thu Jul  8 2004 Jeremy Katz <katzj@redhat.com> - 1.5.90-5
+- use mozilla 1.7 on platforms where it's available
+- check to make sure the appropriate mozilla headers exist if using
+  mozilla nss for ssl or fail the build
+
+* Thu Jul  8 2004 David Malcolm <dmalcolm@redhat.com>
+- rebuilt
+
 * Wed Jul  7 2004 David Malcolm <dmalcolm@redhat.com>
 - rebuilt