rpms/evolution-data-server/devel evolution-data-server-1.3.5-nspr_fix.patch, NONE, 1.1 evolution-data-server.spec, 1.50, 1.51

[fedora-cvs-commits redhat com]

Author: dmalcolm

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7701

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.3.5-nspr_fix.patch 
Log Message:
- Added patch to use nspr rather than mozilla-nspr when doing pkg-config tests
  (Patch5: evolution-data-server-1.3.5-nspr_fix.patch)



evolution-data-server-1.3.5-nspr_fix.patch:
 configure.in |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE evolution-data-server-1.3.5-nspr_fix.patch ---
--- evolution-data-server-1.3.5/configure.in.nspr_fix	2005-07-25 18:40:33.000000000 -0400
+++ evolution-data-server-1.3.5/configure.in	2005-07-25 18:40:39.000000000 -0400
@@ -341,7 +341,7 @@
 				AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
 				msg_smime="yes (Mozilla NSS)"
 			fi				    
-			mozilla_nspr="mozilla-nspr"
+			mozilla_nspr="nspr"
 			mozilla_nss="mozilla-nss"
 			AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
 			AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- evolution-data-server.spec	25 Jul 2005 21:50:20 -0000	1.50
+++ evolution-data-server.spec	25 Jul 2005 23:03:25 -0000	1.51
@@ -24,7 +24,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.3.5
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -32,6 +32,7 @@
 #Patch2: fix_contact_leaks.patch
 Patch3: evolution-data-server-1.0.2-workaround-cal-backend-leak.patch
 #Patch4: evolution-data-server-1.0.2-fix-calendar-factory-GType.patch
+Patch5: evolution-data-server-1.3.5-nspr_fix.patch
 
 # Patch for part of bug #141283 not in upstream tarball (in Ximian bugzilla as 70267)
 #Patch6: evolution-data-server-1.0.2-calendar-optimisation-XB70267.patch
@@ -59,7 +60,7 @@
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
 %if %{use_mozilla_nss}
-BuildRequires: mozilla-nspr-devel
+BuildRequires: nspr-devel
 BuildRequires: mozilla-nss-devel
 %else
 BuildRequires: openssl-devel
@@ -102,7 +103,7 @@
 #%patch2 -p1 -b .fix_contact_leaks
 %patch3 -p1 -b .workaround-cal-backend-leak
 #%patch4 -p1 -b .fix-calendar-factory-GType
-
+%patch5 -p1 -b .fix_nspr
 
 #%patch6 -p0 -b .calendar-optimisation-XB70267
 
@@ -162,6 +163,9 @@
 %define gtkdoc_flags --enable-gtk-doc=no
 %endif
 
+# Rerun autoconf since we patched configure.in:
+autoconf
+
 %configure \
   %gtkdoc_flags \
   --enable-file-locking=fcntl --enable-dot-locking=no \
@@ -209,6 +213,10 @@
 
 
 %changelog
+* Mon Jul 25 2005 David Malcolm <dmalcolm redhat com> - 1.3.5-2
+- Added patch to use nspr rather than mozilla-nspr when doing pkg-config tests
+  (Patch5: evolution-data-server-1.3.5-nspr_fix.patch)
+
 * Mon Jul 25 2005 David Malcolm <dmalcolm redhat com> - 1.3.5-1
 - 1.3.5
 - Split eds_major (was 1.2) into eds_base_version (1.4) and eds_api_version