File project.diff of Package evolution-data-server

Overview Repositories Revisions Requests Users Attributes Meta

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

Currently displaying revision b1c44de35770d87fcf5318640cdbad7b , Show latest

--- dice-eds-changes.patch.orig
+++ dice-eds-changes.patch
@@ -1,7 +1,8 @@
-diff -ruN evolution-data-server-2.27.4/calendar/libecal/e-cal-component.c evolution-data-server-2.27.4.patched/calendar/libecal/e-cal-component.c
---- evolution-data-server-2.27.4/calendar/libecal/e-cal-component.c	2009-07-13 07:22:19.000000000 +0200
-+++ evolution-data-server-2.27.4.patched/calendar/libecal/e-cal-component.c	2009-07-22 11:44:43.000000000 +0200
-@@ -161,6 +161,8 @@
+Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
+===================================================================
+--- evolution-data-server-2.29.3.orig/calendar/libecal/e-cal-component.c
++++ evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c
+@@ -161,6 +161,8 @@ struct _ECalComponentPrivate {
  	 * object over the wire.
  	 */
  	guint need_sequence_inc : 1;
@@ -10,7 +11,7 @@ diff -ruN evolution-data-server-2.27.4/c
  };
  
  /* Private structure for alarms */
-@@ -372,6 +374,9 @@
+@@ -372,6 +374,9 @@ free_icalcomponent (ECalComponent *comp,
  	/* Free the subcomponents */
  
  	g_hash_table_foreach_remove (priv->alarm_uid_hash, free_alarm_cb, NULL);
@@ -20,7 +21,7 @@ diff -ruN evolution-data-server-2.27.4/c
  
  	/* Clean up */
  
-@@ -527,6 +532,13 @@
+@@ -527,6 +532,13 @@ e_cal_component_clone (ECalComponent *co
  	return new_comp;
  }
  
@@ -34,7 +35,7 @@ diff -ruN evolution-data-server-2.27.4/c
  /* Scans an attachment property */
  static void
  scan_attachment (GSList **attachment_list, icalproperty *prop)
-@@ -793,7 +805,8 @@
+@@ -789,7 +801,8 @@ scan_property (ECalComponent *comp, ical
  	case ICAL_LOCATION_PROPERTY :
  		priv->location = prop;
  		break;
@@ -44,7 +45,7 @@ diff -ruN evolution-data-server-2.27.4/c
  	default:
  		break;
  	}
-@@ -949,6 +962,9 @@
+@@ -945,6 +958,9 @@ scan_icalcomponent (ECalComponent *comp)
  
  	g_assert (priv->icalcomp != NULL);
  
@@ -54,7 +55,7 @@ diff -ruN evolution-data-server-2.27.4/c
  	/* Scan properties */
  
  	for (prop = icalcomponent_get_first_property (priv->icalcomp, ICAL_ANY_PROPERTY);
-@@ -1047,7 +1063,9 @@
+@@ -1043,7 +1059,9 @@ e_cal_component_set_new_vtype (ECalCompo
  	case E_CAL_COMPONENT_TIMEZONE:
  		kind = ICAL_VTIMEZONE_COMPONENT;
  		break;
@@ -65,7 +66,7 @@ diff -ruN evolution-data-server-2.27.4/c
  	default:
  		g_assert_not_reached ();
  		kind = ICAL_NO_COMPONENT;
-@@ -1065,8 +1083,8 @@
+@@ -1061,8 +1079,8 @@ e_cal_component_set_new_vtype (ECalCompo
  	scan_icalcomponent (comp);
  
  	/* Add missing stuff */
@@ -76,7 +77,7 @@ diff -ruN evolution-data-server-2.27.4/c
  }
  
  /**
-@@ -1089,6 +1107,7 @@
+@@ -1085,6 +1103,7 @@ e_cal_component_set_icalcomponent (ECalC
  {
  	ECalComponentPrivate *priv;
  	icalcomponent_kind kind;
@@ -84,7 +85,7 @@ diff -ruN evolution-data-server-2.27.4/c
  
  	g_return_val_if_fail (comp != NULL, FALSE);
  	g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE);
-@@ -1111,13 +1130,17 @@
+@@ -1107,13 +1126,17 @@ e_cal_component_set_icalcomponent (ECalC
  	      || kind == ICAL_VTODO_COMPONENT
  	      || kind == ICAL_VJOURNAL_COMPONENT
  	      || kind == ICAL_VFREEBUSY_COMPONENT
@@ -104,7 +105,7 @@ diff -ruN evolution-data-server-2.27.4/c
  
  	return TRUE;
  }
-@@ -1156,6 +1179,7 @@
+@@ -1152,6 +1175,7 @@ void
  e_cal_component_rescan (ECalComponent *comp)
  {
  	ECalComponentPrivate *priv;
@@ -112,7 +113,7 @@ diff -ruN evolution-data-server-2.27.4/c
  
  	g_return_if_fail (comp != NULL);
  	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
-@@ -1167,7 +1191,10 @@
+@@ -1163,7 +1187,10 @@ e_cal_component_rescan (ECalComponent *c
  
  	/* Rescan */
  	scan_icalcomponent (comp);
@@ -124,7 +125,7 @@ diff -ruN evolution-data-server-2.27.4/c
  }
  
  /**
-@@ -1228,6 +1255,9 @@
+@@ -1224,6 +1251,9 @@ e_cal_component_get_vtype (ECalComponent
  	case ICAL_VTIMEZONE_COMPONENT:
  		return E_CAL_COMPONENT_TIMEZONE;
  
@@ -134,7 +135,7 @@ diff -ruN evolution-data-server-2.27.4/c
  	default:
  		/* We should have been loaded with a supported type! */
  		g_assert_not_reached ();
-@@ -2620,6 +2650,27 @@
+@@ -2616,6 +2646,27 @@ e_cal_component_set_dtstart (ECalCompone
  	priv->need_sequence_inc = TRUE;
  }
  
@@ -162,7 +163,7 @@ diff -ruN evolution-data-server-2.27.4/c
  /**
   * e_cal_component_get_due:
   * @comp: A calendar component object.
-@@ -4066,6 +4117,24 @@
+@@ -4060,6 +4111,24 @@ e_cal_component_get_sequence (ECalCompon
  	**sequence = icalproperty_get_sequence (priv->sequence);
  }
  
@@ -187,7 +188,7 @@ diff -ruN evolution-data-server-2.27.4/c
  /**
   * e_cal_component_set_sequence:
   * @comp: A calendar component object.
-@@ -6044,3 +6113,77 @@
+@@ -6038,3 +6107,77 @@ e_cal_component_event_dates_match	(ECalC
  	return retval;
  }
  
@@ -265,10 +266,11 @@ diff -ruN evolution-data-server-2.27.4/c
 +
 +	return -1;
 +}
-diff -ruN evolution-data-server-2.27.4/calendar/libecal/e-cal-component.h evolution-data-server-2.27.4.patched/calendar/libecal/e-cal-component.h
---- evolution-data-server-2.27.4/calendar/libecal/e-cal-component.h	2009-07-13 07:22:19.000000000 +0200
-+++ evolution-data-server-2.27.4.patched/calendar/libecal/e-cal-component.h	2009-07-22 11:44:43.000000000 +0200
-@@ -51,7 +51,8 @@
+Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.h
+===================================================================
+--- evolution-data-server-2.29.3.orig/calendar/libecal/e-cal-component.h
++++ evolution-data-server-2.29.3/calendar/libecal/e-cal-component.h
+@@ -51,7 +51,8 @@ typedef enum {
  	E_CAL_COMPONENT_TODO,
  	E_CAL_COMPONENT_JOURNAL,
  	E_CAL_COMPONENT_FREEBUSY,
@@ -278,7 +280,7 @@ diff -ruN evolution-data-server-2.27.4/c
  } ECalComponentVType;
  
  /* Field identifiers for a calendar component; these are used by the data model
-@@ -256,6 +257,7 @@
+@@ -256,6 +257,7 @@ void e_cal_component_set_dtend (ECalComp
  void e_cal_component_get_dtstamp (ECalComponent *comp, struct icaltimetype *t);
  void e_cal_component_set_dtstamp (ECalComponent *comp, struct icaltimetype *t);
  
@@ -286,7 +288,7 @@ diff -ruN evolution-data-server-2.27.4/c
  void e_cal_component_get_dtstart (ECalComponent *comp, ECalComponentDateTime *dt);
  void e_cal_component_set_dtstart (ECalComponent *comp, ECalComponentDateTime *dt);
  
-@@ -312,6 +314,8 @@
+@@ -312,6 +314,8 @@ gboolean e_cal_component_is_instance (EC
  void e_cal_component_get_sequence (ECalComponent *comp, gint **sequence);
  void e_cal_component_set_sequence (ECalComponent *comp, gint *sequence);
  
@@ -295,7 +297,7 @@ diff -ruN evolution-data-server-2.27.4/c
  void e_cal_component_get_status (ECalComponent *comp, icalproperty_status *status);
  void e_cal_component_set_status (ECalComponent *comp, icalproperty_status status);
  
-@@ -457,6 +461,10 @@
+@@ -457,6 +461,10 @@ gboolean e_cal_component_alarm_has_atten
  
  icalcomponent *e_cal_component_alarm_get_icalcomponent (ECalComponentAlarm *alarm);
  
--- evolution-data-server-shared-nss-db.patch.orig
+++ evolution-data-server-shared-nss-db.patch
@@ -1,8 +1,8 @@
-Index: evolution-data-server-2.27.2/camel/camel.c
+Index: evolution-data-server-2.29.3/camel/camel.c
 ===================================================================
---- evolution-data-server-2.27.2.orig/camel/camel.c
-+++ evolution-data-server-2.27.2/camel/camel.c
-@@ -38,6 +38,8 @@
+--- evolution-data-server-2.29.3.orig/camel/camel.c
++++ evolution-data-server-2.29.3/camel/camel.c
+@@ -37,6 +37,8 @@
  #include <glib.h>
  #include <glib/gi18n-lib.h>
  
@@ -11,7 +11,7 @@ Index: evolution-data-server-2.27.2/came
  #include "camel.h"
  #include "camel-certdb.h"
  #include "camel-debug.h"
-@@ -94,17 +96,21 @@ camel_init (const char *configdir, gbool
+@@ -93,17 +95,21 @@ camel_init (const gchar *configdir, gboo
  		nss_configdir = g_win32_locale_filename_from_utf8 (configdir);
  #endif
  
@@ -43,15 +43,15 @@ Index: evolution-data-server-2.27.2/came
  				}
  			}
  		}
-Index: evolution-data-server-2.27.2/configure.ac
+Index: evolution-data-server-2.29.3/configure.ac
 ===================================================================
---- evolution-data-server-2.27.2.orig/configure.ac
-+++ evolution-data-server-2.27.2/configure.ac
-@@ -575,6 +575,7 @@ if test "x${enable_nss}" = "xyes" || tes
+--- evolution-data-server-2.29.3.orig/configure.ac
++++ evolution-data-server-2.29.3/configure.ac
+@@ -540,6 +540,7 @@ dnl check if pkg-config files exist (whi
  		done
- 		
+ 
  		if test -n "$mozilla_nspr" -a -n "$mozilla_nss"; then
 +			mozilla_nss="$mozilla_nss nss-shared-helper"
- 			msg_ssl="yes (Mozilla NSS)"
+ 			msg_ssl="yes"
  			if test "x$enable_smime" = "xyes"; then
  				AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled])
--- evolution-data-server.changes.orig
+++ evolution-data-server.changes
@@ -1,4 +1,20 @@
 -------------------------------------------------------------------
+Tue Dec  1 20:20:09 CET 2009 - dimstar@opensuse.org
+
+- Update to version 2.29.3:
+  + For the entire list of changes, see NEWS file.
+- Rebase evolution-data-server-shared-nss-db.patch and
+  dice-eds-changes.patch
+- No longer carry a evolution-data-server wrapper script.
+- Remove libbonobo-devel BuildRequires.
+- Workaround en@shaw not being owned by filesystem, bnc#559206.
+- Dropped evolution-data-server-1.11.5-cert-auth-complete.patch,
+  bnc-304835-ex-crash-after-restart.patch and
+  bnc-307861-calendar-auth.diff; they had no future upstream.
+- Remove gnome-certauth-devel BuildRequires and Requires.
+- Move libexecdir from libdir to libexecdir
+
+-------------------------------------------------------------------
 Tue Sep 22 09:46:47 CEST 2009 - dimstar@opensuse.org
 
 - Update to version 2.28.0
--- evolution-data-server.spec.orig
+++ evolution-data-server.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package evolution-data-server (Version 2.28.0)
+# spec file for package evolution-data-server (Version 2.29.3)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -19,7 +19,7 @@
 
 
 Name:           evolution-data-server
-%define _evo_version 2.28
+%define _evo_version 2.30
 BuildRequires:  bison
 BuildRequires:  db-devel
 %if %suse_version > 1100
@@ -29,13 +29,11 @@ BuildRequires:  openldap2-devel
 %endif
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  gnome-certauth-devel
 BuildRequires:  gnome-common
 BuildRequires:  gnome-keyring-devel
 BuildRequires:  gtk-doc
 BuildRequires:  intltool
 BuildRequires:  krb5-devel
-BuildRequires:  libbonobo-devel
 BuildRequires:  libglade2-devel
 BuildRequires:  libgweather-devel >= 2.25.4
 BuildRequires:  libical-devel >= 0.43
@@ -58,21 +56,13 @@ Obsoletes:      evolution-data-server-64
 Obsoletes:      evolution-data-server-32bit
 %endif
 Summary:        Evolution Data Server
-Version:        2.28.0
+Version:        2.29.3
 Release:        1
 Source0:        ftp://ftp.gnome.org/pub/gnome/sources/evolution-data-server/2.25/%{name}-%{version}.tar.bz2
-# PATCH-NEEDS-REBASE evolution-data-server-1.11.5-cert-auth-complete.patch bgo253574 -- Fix has been submitted to bgo. (was PATCH-FIX-UPSTREAM)
-#Patch3:         evolution-data-server-1.11.5-cert-auth-complete.patch
-# PATCH-NEEDS-REBASE bnc-304835-ex-crash-after-restart.patch bnc304835 bgo253574 -- Fix has been submitted to bgo. (was PATCH-FIX-UPSTREAM)
-#Patch4:         bnc-304835-ex-crash-after-restart.patch
-# PATCH-NEEDS-REBASE bnc-307861-calendar-auth.diff -- bnc307861 bgo253574 -- Fix has been submitted to bgo. (was PATCH-FIX-UPSTREAM)
-#Patch5:         bnc-307861-calendar-auth.diff
 # PATCH-FEATURE-OPENSUSE dice-eds-changes.patch pchenthill@novell.com -- Patch yet to be pushed upstream
-Patch7:         dice-eds-changes.patch
-# PATCH-NEEDS-REBASE bnc-210959-eds-accept_ics.patch bnc210959  pchenthill@novell.com -- Patch yet to be pushed upstream. (Was: PATCH-FIX-UPSTREAM)
-#Patch16:        bnc-210959-eds-accept_ics.patch
+Patch0:         dice-eds-changes.patch
 # PATCH-FEATURE-OPENSUSE evolution-data-server-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database.
-Patch18:        evolution-data-server-shared-nss-db.patch
+Patch1:         evolution-data-server-shared-nss-db.patch
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       %{name}-lang = %{version}
@@ -96,12 +86,10 @@ Group:          Development/Libraries/GN
 Requires:       evolution-data-server = %{?epoch:}%{version}-%{release}
 Requires:       gconf2-devel
 Requires:       glib2-devel
-Requires:       gnome-certauth-devel
 Requires:       gnome-keyring-devel
 Requires:       gnome-vfs2-devel
 Requires:       gtk2-devel
 Requires:       krb5-devel
-Requires:       libbonobo-devel
 Requires:       libcom_err
 Requires:       libglade2-devel
 Requires:       libgweather-devel >= 2.25.4
@@ -143,18 +131,13 @@ documentation.
 %prep
 %setup -q
 translation-update-upstream
-###%patch3
-###%patch4
-###%patch5
-%patch7 -p1
-# NEEDS REBASE
-# %%patch16
-%patch18 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 NOCONFIGURE=1 gnome-autogen.sh
 %{configure} \
-    --libexecdir=%{_libdir}/evolution-data-server \
+    --libexecdir=%{_libexecdir}/evolution-data-server \
 %if %suse_version > 1100
     --with-openldap=%{_libdir}/evoldap \
 %else
@@ -177,16 +160,14 @@ NOCONFIGURE=1 gnome-autogen.sh
 
 %install
 %{makeinstall}
+%if 0%{?suse_version} <= 1120
+%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
+%endif
 # Remove the libtool archive files
 %{__rm} $RPM_BUILD_ROOT/%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT/%{_libdir}/*/*/*.la
 %find_lang evolution-data-server-%{_evo_version}
 %fdupes $RPM_BUILD_ROOT
-%if %suse_version > 1100
-%{__mv} $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version} $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}.bin
-echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}\" %{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}.bin \"\$@\"" > $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}
-%{__chmod} +x $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/evolution-data-server-%{_evo_version}
-%endif
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -199,12 +180,11 @@ echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=
 %defattr(-,root,root)
 %doc COPYING ChangeLog NEWS TODO
 %{_datadir}/evolution-data-server-%{_evo_version}
-%{_datadir}/idl/evolution-data-server-1.2
 %{_datadir}/pixmaps/evolution-data-server
+%{_datadir}/dbus-1/services/org.gnome.evolution.dataserver.*.service
 %{_libdir}/*.so.*
-%{_libdir}/bonobo/servers/*
-%{_libdir}/evolution-data-server
 %{_libdir}/evolution-data-server-1.2
+%{_libexecdir}/evolution-data-server
 
 %files lang -f evolution-data-server-%{_evo_version}.lang

Places

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

Places