rpms/evolution-data-server/devel evolution-data-server-1.3.5-nspr_fix.patch, 1.1, 1.2 evolution-data-server.spec, 1.74, 1.75

[fedora-cvs-commits at redhat.com]

Author: dmalcolm

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

Modified Files:
	evolution-data-server-1.3.5-nspr_fix.patch 
	evolution-data-server.spec 
Log Message:
* Mon Dec 19 2005 David Malcolm <dmalcolm at redhat.com> - 1.5.3-2
- Update specfile and patch 5 (evolution-data-server-1.3.5-nspr_fix.patch) to
  use nss rather than mozilla-nss throughout



evolution-data-server-1.3.5-nspr_fix.patch:
 configure.in |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Index: evolution-data-server-1.3.5-nspr_fix.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server-1.3.5-nspr_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-data-server-1.3.5-nspr_fix.patch	25 Jul 2005 23:03:25 -0000	1.1
+++ evolution-data-server-1.3.5-nspr_fix.patch	19 Dec 2005 22:50:23 -0000	1.2
@@ -1,11 +1,21 @@
---- 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 @@
+--- evolution-data-server-1.5.3/configure.in.fix_nspr	2005-12-12 11:35:05.000000000 -0500
++++ evolution-data-server-1.5.3/configure.in	2005-12-19 17:10:19.000000000 -0500
+@@ -345,15 +345,15 @@
+ 	fi
+ 	
+ 	if test "x${check_manually}" = "xno"; then
+-		PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes", have_nss="no")
++		PKG_CHECK_MODULES(NSS, nss, have_nss="yes", have_nss="no")
+ 		if test "x${have_nss}" = "xyes"; 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				    
 -			mozilla_nspr="mozilla-nspr"
+-			mozilla_nss="mozilla-nss"
 +			mozilla_nspr="nspr"
- 			mozilla_nss="mozilla-nss"
++			mozilla_nss="nss"
  			AC_DEFINE(HAVE_NSS,1,[Define if you have NSS])
  			AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library])
+ 			MANUAL_NSPR_CFLAGS=""


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- evolution-data-server.spec	19 Dec 2005 21:03:17 -0000	1.74
+++ evolution-data-server.spec	19 Dec 2005 22:50:23 -0000	1.75
@@ -1,4 +1,4 @@
-%define use_mozilla_nss 1
+%define use_nss 1
 %define ldap_support 1
 %define static_ldap 0
 %define krb5_support 1
@@ -20,7 +20,7 @@
 Summary: Backend data server for evolution
 Name: evolution-data-server
 Version: 1.5.3
-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
@@ -56,9 +56,9 @@
 BuildRequires: libbonobo-devel >= %{libbonobo_version}
 BuildRequires: libgnomeui-devel
 BuildRequires: libglade2-devel
-%if %{use_mozilla_nss}
+%if %{use_nss}
 BuildRequires: nspr-devel
-BuildRequires: mozilla-nss-devel
+BuildRequires: nss-devel
 %else
 BuildRequires: openssl-devel
 %endif
@@ -143,22 +143,22 @@
 %define nntp_flags --enable-nntp=no
 %endif
 
-%if %{use_mozilla_nss}
+%if %{use_nss}
 %define ssl_flags --enable-nss=yes --enable-smime=yes
 %else
 %define ssl_flags --enable-openssl=yes
 %endif
 
-%if %{use_mozilla_nss}
-if ! pkg-config --exists mozilla-nss; then 
-  echo "Unable to find suitable version of mozilla nss to use!"
+%if %{use_nss}
+if ! pkg-config --exists nss; then 
+  echo "Unable to find suitable version of nss to use!"
   exit 1
 fi
 %endif
 
 CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
 CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"; export CFLAGS
-%if ! %{use_mozilla_nss}
+%if ! %{use_nss}
 if pkg-config openssl ; then
 	CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
 	LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`"
@@ -228,6 +228,10 @@
 
 
 %changelog
+* Mon Dec 19 2005 David Malcolm <dmalcolm at redhat.com> - 1.5.3-2
+- Update specfile and patch 5 (evolution-data-server-1.3.5-nspr_fix.patch) to
+  use nss rather than mozilla-nss throughout
+
 * Mon Dec 19 2005 David Malcolm <dmalcolm at redhat.com> - 1.5.3-1
 - 1.5.3