From 5e1e1e3e7a1e00e8a44e8d28edafbe335d406697845b44dbc00aaa570cd31247 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 18 Dec 2009 12:04:22 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=46 --- dice-eds-changes.patch | 52 +++++++++++------------ evolution-data-server-2.28.0.tar.bz2 | 3 ++ evolution-data-server-2.29.3.tar.bz2 | 3 -- evolution-data-server-shared-nss-db.patch | 22 +++++----- evolution-data-server.changes | 16 ------- evolution-data-server.spec | 46 ++++++++++++++------ 6 files changed, 72 insertions(+), 70 deletions(-) create mode 100644 evolution-data-server-2.28.0.tar.bz2 delete mode 100644 evolution-data-server-2.29.3.tar.bz2 diff --git a/dice-eds-changes.patch b/dice-eds-changes.patch index 1e223f4..e5afca8 100644 --- a/dice-eds-changes.patch +++ b/dice-eds-changes.patch @@ -1,8 +1,7 @@ -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 { +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 @@ * object over the wire. */ guint need_sequence_inc : 1; @@ -11,7 +10,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c }; /* Private structure for alarms */ -@@ -372,6 +374,9 @@ free_icalcomponent (ECalComponent *comp, +@@ -372,6 +374,9 @@ /* Free the subcomponents */ g_hash_table_foreach_remove (priv->alarm_uid_hash, free_alarm_cb, NULL); @@ -21,7 +20,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c /* Clean up */ -@@ -527,6 +532,13 @@ e_cal_component_clone (ECalComponent *co +@@ -527,6 +532,13 @@ return new_comp; } @@ -35,7 +34,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c /* Scans an attachment property */ static void scan_attachment (GSList **attachment_list, icalproperty *prop) -@@ -789,7 +801,8 @@ scan_property (ECalComponent *comp, ical +@@ -793,7 +805,8 @@ case ICAL_LOCATION_PROPERTY : priv->location = prop; break; @@ -45,7 +44,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c default: break; } -@@ -945,6 +958,9 @@ scan_icalcomponent (ECalComponent *comp) +@@ -949,6 +962,9 @@ g_assert (priv->icalcomp != NULL); @@ -55,7 +54,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c /* Scan properties */ for (prop = icalcomponent_get_first_property (priv->icalcomp, ICAL_ANY_PROPERTY); -@@ -1043,7 +1059,9 @@ e_cal_component_set_new_vtype (ECalCompo +@@ -1047,7 +1063,9 @@ case E_CAL_COMPONENT_TIMEZONE: kind = ICAL_VTIMEZONE_COMPONENT; break; @@ -66,7 +65,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c default: g_assert_not_reached (); kind = ICAL_NO_COMPONENT; -@@ -1061,8 +1079,8 @@ e_cal_component_set_new_vtype (ECalCompo +@@ -1065,8 +1083,8 @@ scan_icalcomponent (comp); /* Add missing stuff */ @@ -77,7 +76,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c } /** -@@ -1085,6 +1103,7 @@ e_cal_component_set_icalcomponent (ECalC +@@ -1089,6 +1107,7 @@ { ECalComponentPrivate *priv; icalcomponent_kind kind; @@ -85,7 +84,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c g_return_val_if_fail (comp != NULL, FALSE); g_return_val_if_fail (E_IS_CAL_COMPONENT (comp), FALSE); -@@ -1107,13 +1126,17 @@ e_cal_component_set_icalcomponent (ECalC +@@ -1111,13 +1130,17 @@ || kind == ICAL_VTODO_COMPONENT || kind == ICAL_VJOURNAL_COMPONENT || kind == ICAL_VFREEBUSY_COMPONENT @@ -105,7 +104,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c return TRUE; } -@@ -1152,6 +1175,7 @@ void +@@ -1156,6 +1179,7 @@ e_cal_component_rescan (ECalComponent *comp) { ECalComponentPrivate *priv; @@ -113,7 +112,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c g_return_if_fail (comp != NULL); g_return_if_fail (E_IS_CAL_COMPONENT (comp)); -@@ -1163,7 +1187,10 @@ e_cal_component_rescan (ECalComponent *c +@@ -1167,7 +1191,10 @@ /* Rescan */ scan_icalcomponent (comp); @@ -125,7 +124,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c } /** -@@ -1224,6 +1251,9 @@ e_cal_component_get_vtype (ECalComponent +@@ -1228,6 +1255,9 @@ case ICAL_VTIMEZONE_COMPONENT: return E_CAL_COMPONENT_TIMEZONE; @@ -135,7 +134,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c default: /* We should have been loaded with a supported type! */ g_assert_not_reached (); -@@ -2616,6 +2646,27 @@ e_cal_component_set_dtstart (ECalCompone +@@ -2620,6 +2650,27 @@ priv->need_sequence_inc = TRUE; } @@ -163,7 +162,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c /** * e_cal_component_get_due: * @comp: A calendar component object. -@@ -4060,6 +4111,24 @@ e_cal_component_get_sequence (ECalCompon +@@ -4066,6 +4117,24 @@ **sequence = icalproperty_get_sequence (priv->sequence); } @@ -188,7 +187,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c /** * e_cal_component_set_sequence: * @comp: A calendar component object. -@@ -6038,3 +6107,77 @@ e_cal_component_event_dates_match (ECalC +@@ -6044,3 +6113,77 @@ return retval; } @@ -266,11 +265,10 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.c + + return -1; +} -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 { +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 @@ E_CAL_COMPONENT_TODO, E_CAL_COMPONENT_JOURNAL, E_CAL_COMPONENT_FREEBUSY, @@ -280,7 +278,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.h } ECalComponentVType; /* Field identifiers for a calendar component; these are used by the data model -@@ -256,6 +257,7 @@ void e_cal_component_set_dtend (ECalComp +@@ -256,6 +257,7 @@ void e_cal_component_get_dtstamp (ECalComponent *comp, struct icaltimetype *t); void e_cal_component_set_dtstamp (ECalComponent *comp, struct icaltimetype *t); @@ -288,7 +286,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.h void e_cal_component_get_dtstart (ECalComponent *comp, ECalComponentDateTime *dt); void e_cal_component_set_dtstart (ECalComponent *comp, ECalComponentDateTime *dt); -@@ -312,6 +314,8 @@ gboolean e_cal_component_is_instance (EC +@@ -312,6 +314,8 @@ void e_cal_component_get_sequence (ECalComponent *comp, gint **sequence); void e_cal_component_set_sequence (ECalComponent *comp, gint *sequence); @@ -297,7 +295,7 @@ Index: evolution-data-server-2.29.3/calendar/libecal/e-cal-component.h 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 @@ gboolean e_cal_component_alarm_has_atten +@@ -457,6 +461,10 @@ icalcomponent *e_cal_component_alarm_get_icalcomponent (ECalComponentAlarm *alarm); diff --git a/evolution-data-server-2.28.0.tar.bz2 b/evolution-data-server-2.28.0.tar.bz2 new file mode 100644 index 0000000..eaabe2f --- /dev/null +++ b/evolution-data-server-2.28.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01fead604816fb135aeb5921687d99773e966014a17c1cae230c307386e13814 +size 14469718 diff --git a/evolution-data-server-2.29.3.tar.bz2 b/evolution-data-server-2.29.3.tar.bz2 deleted file mode 100644 index ee4cb4c..0000000 --- a/evolution-data-server-2.29.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:47fb9d84e279d80e2472fd73d00429b3c08631b19eff4d2997712233cb4c1bcf -size 4535529 diff --git a/evolution-data-server-shared-nss-db.patch b/evolution-data-server-shared-nss-db.patch index b468341..c10a829 100644 --- a/evolution-data-server-shared-nss-db.patch +++ b/evolution-data-server-shared-nss-db.patch @@ -1,8 +1,8 @@ -Index: evolution-data-server-2.29.3/camel/camel.c +Index: evolution-data-server-2.27.2/camel/camel.c =================================================================== ---- evolution-data-server-2.29.3.orig/camel/camel.c -+++ evolution-data-server-2.29.3/camel/camel.c -@@ -37,6 +37,8 @@ +--- evolution-data-server-2.27.2.orig/camel/camel.c ++++ evolution-data-server-2.27.2/camel/camel.c +@@ -38,6 +38,8 @@ #include #include @@ -11,7 +11,7 @@ Index: evolution-data-server-2.29.3/camel/camel.c #include "camel.h" #include "camel-certdb.h" #include "camel-debug.h" -@@ -93,17 +95,21 @@ camel_init (const gchar *configdir, gboo +@@ -94,17 +96,21 @@ camel_init (const char *configdir, gbool nss_configdir = g_win32_locale_filename_from_utf8 (configdir); #endif @@ -43,15 +43,15 @@ Index: evolution-data-server-2.29.3/camel/camel.c } } } -Index: evolution-data-server-2.29.3/configure.ac +Index: evolution-data-server-2.27.2/configure.ac =================================================================== ---- 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 +--- 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 done - + if test -n "$mozilla_nspr" -a -n "$mozilla_nss"; then + mozilla_nss="$mozilla_nss nss-shared-helper" - msg_ssl="yes" + msg_ssl="yes (Mozilla NSS)" if test "x$enable_smime" = "xyes"; then AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled]) diff --git a/evolution-data-server.changes b/evolution-data-server.changes index 82e290f..dbadb8c 100644 --- a/evolution-data-server.changes +++ b/evolution-data-server.changes @@ -1,19 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/evolution-data-server.spec b/evolution-data-server.spec index f299767..52124f1 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution-data-server (Version 2.29.3) +# spec file for package evolution-data-server (Version 2.28.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: evolution-data-server -%define _evo_version 2.30 +%define _evo_version 2.28 BuildRequires: bison BuildRequires: db-devel %if %suse_version > 1100 @@ -29,11 +29,13 @@ 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 @@ -56,13 +58,21 @@ Obsoletes: evolution-data-server-64bit Obsoletes: evolution-data-server-32bit %endif Summary: Evolution Data Server -Version: 2.29.3 +Version: 2.28.0 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 -Patch0: dice-eds-changes.patch +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 # PATCH-FEATURE-OPENSUSE evolution-data-server-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database. -Patch1: evolution-data-server-shared-nss-db.patch +Patch18: evolution-data-server-shared-nss-db.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -86,10 +96,12 @@ Group: Development/Libraries/GNOME 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 @@ -131,13 +143,18 @@ documentation. %prep %setup -q translation-update-upstream -%patch0 -p1 -%patch1 -p1 +###%patch3 +###%patch4 +###%patch5 +%patch7 -p1 +# NEEDS REBASE +# %%patch16 +%patch18 -p1 %build NOCONFIGURE=1 gnome-autogen.sh %{configure} \ - --libexecdir=%{_libexecdir}/evolution-data-server \ + --libexecdir=%{_libdir}/evolution-data-server \ %if %suse_version > 1100 --with-openldap=%{_libdir}/evoldap \ %else @@ -160,14 +177,16 @@ 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 @@ -180,11 +199,12 @@ NOCONFIGURE=1 gnome-autogen.sh %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