File project.diff of Package evolution-data-server

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package evolution-data-server (Revision 8e2e8802b18570164897d2b4fdcf5b7a)

Currently displaying revision 8e2e8802b18570164897d2b4fdcf5b7a , Show latest

--- evolution-data-server-shared-nss-db.patch.orig
+++ evolution-data-server-shared-nss-db.patch
@@ -0,0 +1,48 @@
+diff -upr evolution-data-server-2.24.1-old/camel/camel.c evolution-data-server-2.24.1-new/camel/camel.c
+--- evolution-data-server-2.24.1-old/camel/camel.c	2008-10-13 03:07:53.000000000 -0500
++++ evolution-data-server-2.24.1-new/camel/camel.c	2008-10-26 19:14:49.000000000 -0600
+@@ -38,6 +38,8 @@
+ #include <glib.h>
+ #include <glib/gi18n-lib.h>
+ 
++#include <nss-shared-helper.h>
++
+ #include "camel.h"
+ #include "camel-certdb.h"
+ #include "camel-debug.h"
+@@ -78,12 +80,16 @@ camel_init (const char *configdir, gbool
+ 		nss_configdir = g_win32_locale_filename_from_utf8 (configdir);
+ #endif
+ 
+-		if (NSS_InitReadWrite (nss_configdir) == SECFailure) {
+-			/* fall back on using volatile dbs? */
+-			if (NSS_NoDB_Init (nss_configdir) == SECFailure) {
+-				g_free (nss_configdir);
+-				g_warning ("Failed to initialize NSS");
+-				return -1;
++		if (nsshelp_open_db ("evolution", nss_configdir, 0) != SECSuccess) {
++			g_warning ("Opening non-shared cert database");
++
++			if (NSS_InitReadWrite (nss_configdir) == SECFailure) {
++				/* fall back on using volatile dbs? */
++				if (NSS_NoDB_Init (nss_configdir) == SECFailure) {
++					g_free (nss_configdir);
++					g_warning ("Failed to initialize NSS");
++					return -1;
++				}
+ 			}
+ 		}
+ 
+diff -upr evolution-data-server-2.24.1-old/configure.in evolution-data-server-2.24.1-new/configure.in
+--- evolution-data-server-2.24.1-old/configure.in	2008-10-19 22:26:33.000000000 -0500
++++ evolution-data-server-2.24.1-new/configure.in	2008-10-26 19:17:20.000000000 -0600
+@@ -535,6 +535,9 @@ if test "x${enable_nss}" = "xyes" || tes
+ 				AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
+ 				msg_smime="yes (Mozilla NSS)"
+ 			fi
++
++                        mozilla_nss="$mozilla_nss nss-shared-helper"
++
+ 			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=""
--- evolution-data-server.changes.orig
+++ evolution-data-server.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue Oct 28 17:44:26 CST 2008 - maw@suse.de
+
+- Reorder the list of build requirements
+- Tag eds-core-mapi-changes.diff
+- Run autotools before running configure.
+
+-------------------------------------------------------------------
 Mon Oct 27 19:05:54 CET 2008 - aj@suse.de
 
 - The package is called libevoldap-2_4-2.
@@ -10,6 +17,12 @@ Mon Oct 27 12:14:48 CET 2008 - kukuk@sus
   [bnc#439152].
 
 -------------------------------------------------------------------
+Sun Oct 26 23:53:18 CST 2008 - hpj@novell.com
+
+- Add evolution-data-server-shared-nss-db.patch, which lets us
+  migrate to new, shared NSS database and location.
+
+-------------------------------------------------------------------
 Sat Oct 25 22:07:50 IST 2008 - msuman@suse.de
 
 - Use evoldap2-client only for SUSE versions above 11.0, fallback to 
--- evolution-data-server.spec.orig
+++ evolution-data-server.spec
@@ -21,6 +21,11 @@
 Name:           evolution-data-server
 BuildRequires:  bison
 BuildRequires:  db-devel
+%if %suse_version > 1100
+BuildRequires:  evoldap2-devel
+%else
+BuildRequires:  openldap2-devel
+%endif
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  gnome-certauth-devel
@@ -34,15 +39,11 @@ BuildRequires:  libgnome-devel
 BuildRequires:  libidl-devel
 BuildRequires:  libsoup-devel
 BuildRequires:  mozilla-nss-devel
+BuildRequires:  nss-shared-helper-devel
 BuildRequires:  perl-XML-Parser
 BuildRequires:  python-devel
 BuildRequires:  sgml-skel
 BuildRequires:  sqlite3-devel
-%if %suse_version > 1100
-BuildRequires:  evoldap2-devel
-%else
-BuildRequires:  openldap2-devel
-%endif
 License:        GPL v2 or later
 Group:          Development/Libraries/GNOME
 AutoReqProv:    on
@@ -57,6 +58,9 @@ Patch4:         bnc-304835-ex-crash-afte
 # PATCH-FIX-UPSTREAM bnc-307861-calendar-auth.diff -- bnc307861 bgo253574 -- Fix has been submitted to bgo.
 Patch5:         bnc-307861-calendar-auth.diff 
 # This patch contains changes in the core code base for the MAPI provider. 
+# PATCH-FEATURE-OPENSUSE evolution-data-server-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database.
+Patch10:        evolution-data-server-shared-nss-db.patch
+# PATCH-FIX-OPENSUSE eds-core-mapi-changes.diff msuman@suse.de -- msuman decided it would be too difficult to tag this patch
 Patch100:       eds-core-mapi-changes.diff
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -127,9 +131,18 @@ documentation.
 ###%patch3
 ###%patch4
 ###%patch5
+%patch10 -p1
 %patch100 -p1
 
 %build
+intltoolize --force --copy
+# should use autoreconf, but libdb is broken
+libtoolize --force --copy
+aclocal
+autoconf
+automake -a
+autoheader
+(pushd calendar/libical; autoreconf -fi; popd)
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"

Places

File project.diff of Package evolution-data-server (Revision 8e2e8802b18570164897d2b4fdcf5b7a)

Places