rpms/evolution-data-server/devel evolution-data-server-1.7.1-nss_auto_detect.patch, NONE, 1.1 evolution-data-server.spec, 1.90, 1.91

[fedora-cvs-commits at redhat.com]

Author: mbarnes

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

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.7.1-nss_auto_detect.patch 
Log Message:
- Add temporary patch evolution-data-server-1.7.1-nss_auto_detect.patch
  to help `configure' detect the SSL modules (closes #191567).


evolution-data-server-1.7.1-nss_auto_detect.patch:
 configure.in |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

--- NEW FILE evolution-data-server-1.7.1-nss_auto_detect.patch ---
--- evolution-data-server-1.7.1/configure.in.nss_auto_detect	2006-05-14 21:34:10.000000000 -0400
+++ evolution-data-server-1.7.1/configure.in	2006-05-14 21:34:20.000000000 -0400
@@ -97,6 +97,7 @@
 dnl Initialize maintainer mode
 AM_MAINTAINER_MODE
 
+
 AC_ISC_POSIX
 AC_PROG_CC
 AC_PROG_CPP
@@ -142,6 +143,8 @@
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
+PKG_PROG_PKG_CONFIG
+
 dnl ******************************
 dnl Check for Win32
 dnl ******************************
@@ -390,20 +393,38 @@
 
 if test "x${enable_nss}" = "xyes" || test "x${enable_nss}" = "xstatic"; then
 	if test -n "${with_nspr_includes}" || test -n "${with_nspr_libs}" || test -n "${with_nss_includes}" || test -n "${with_nss_libs}" || test "x${enable_nss}" = "xstatic"; then
-dnl If the user specifies --with-foo or --enable-nss=static, then we have to do this manually
 		check_manually="yes"
 	else
 		check_manually="no"
 	fi
 	
 	if test "x${check_manually}" = "xno"; then
-		PKG_CHECK_MODULES(NSS, nss, have_nss="yes", have_nss="no")
-		if test "x${have_nss}" = "xyes"; then
+		AC_MSG_CHECKING(Mozilla NSPR pkg-config module name)
+		mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr"
+		for pc in $mozilla_nspr_pcs; do
+			if $PKG_CONFIG --exists $pc; then
+				AC_MSG_RESULT($pc)
+				mozilla_nspr=$pc
+				break;
+			fi
+		done
+		
+		AC_MSG_CHECKING(Mozilla NSS pkg-config module name)
+		mozilla_nss_pcs="nss mozilla-nss firefox-nss"
+		for pc in $mozilla_nss_pcs; do
+			if $PKG_CONFIG --exists $pc; then
+				AC_MSG_RESULT($pc)
+				mozilla_nss=$pc
+				break;
+			fi
+		done
+		
+		if test -n "$mozilla_nspr" -a -n "$mozilla_nss"; then
 			msg_ssl="yes (Mozilla NSS)"
 			if test "x$enable_smime" = "xyes"; then
 				AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
 				msg_smime="yes (Mozilla NSS)"
-			fi				    
+			fi
 			mozilla_nspr="nspr"
 			mozilla_nss="nss"
 			AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
@@ -414,11 +435,12 @@
 			MANUAL_NSS_LIBS=""
 		else
 			check_manually="yes"
+			mozilla_nspr=""
+			mozilla_nss=""
 		fi
 	fi
 	
 	if test "x${check_manually}" = "xyes"; then
-		mozilla_nss=""
 		have_nspr_includes="no"
 		if test "x${with_nspr_includes}" != "xno"; then
 			CPPFLAGS_save="$CPPFLAGS"


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- evolution-data-server.spec	11 May 2006 20:14:45 -0000	1.90
+++ evolution-data-server.spec	15 May 2006 03:07:27 -0000	1.91
@@ -21,7 +21,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.7.1
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Libraries
 Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/%{name}-%{version}.tar.bz2
@@ -47,6 +47,9 @@
 
 Patch300: evolution-data-server-1.5.4-make_imap4_optional.patch
 
+# Temporary upstream patch to make SSL work again.
+Patch301: evolution-data-server-1.7.1-nss_auto_detect.patch
+
 BuildRoot: %{_tmppath}/%{name}-root
 Requires: libsoup >= %{soup_version}
 Requires: ORBit2 >= %{orbit2_version}
@@ -122,6 +125,7 @@
 %patch200 -p0 -b .fix-uid-leak
 %patch201 -p0 -b .fix-comp-ref-leak
 %patch300 -p1 -b .make_imap4_optional
+%patch301 -p1 -b .nss_auto_detect
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -319,6 +323,10 @@
 
 
 %changelog
+* Sun May 14 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.1-2
+- Add temporary patch evolution-data-server-1.7.1-nss_auto_detect.patch
+  to help `configure' detect the SSL modules (closes #191567).
+
 * Wed May 10 2006 Matthew Barnes <mbarnes at redhat.com> - 1.7.1-1
 - Update to 1.7.1
 - Bump eds_base_version from 1.6 to 1.8.