From 18277f7b9100cf648ae663665a1b50e376b41266ea1252abeed261a4760ba794 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 11 Nov 2012 21:51:11 +0000 Subject: [PATCH] Accepting request 140300 from home:dimstar:branches:GNOME:Factory Drop USE_EVOLDAP usage.. this package is gone... OBS-URL: https://build.opensuse.org/request/show/140300 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=187 --- bnc-210959-evo-accept-ics.patch | 58 ------------------------ evolution-custom-openldap-includes.patch | 13 ------ evolution.changes | 11 +++++ evolution.spec | 29 ++---------- 4 files changed, 14 insertions(+), 97 deletions(-) delete mode 100644 bnc-210959-evo-accept-ics.patch delete mode 100644 evolution-custom-openldap-includes.patch diff --git a/bnc-210959-evo-accept-ics.patch b/bnc-210959-evo-accept-ics.patch deleted file mode 100644 index 101171b..0000000 --- a/bnc-210959-evo-accept-ics.patch +++ /dev/null @@ -1,58 +0,0 @@ -Index: plugins/itip-formatter/itip-formatter.c -=================================================================== ---- plugins/itip-formatter/itip-formatter.c.orig -+++ plugins/itip-formatter/itip-formatter.c -@@ -1860,6 +1860,26 @@ idle_open_cb (gpointer data) - return FALSE; - } - -+static gboolean -+is_gw_item (icalcomponent *icalcomp) -+{ -+ icalproperty *prop; -+ -+ prop = icalcomponent_get_first_property (icalcomp, ICAL_X_PROPERTY); -+ while (prop) { -+ const char *x_name, *x_val; -+ -+ x_name = icalproperty_get_x_name (prop); -+ x_val = icalproperty_get_x (prop); -+ if (!strcmp (x_name, "X-GWRECORDID")) { -+ return TRUE; -+ } -+ -+ prop = icalcomponent_get_next_property (icalcomp, ICAL_X_PROPERTY); -+ } -+ return FALSE; -+} -+ - static void - view_response_cb (GtkWidget *widget, - ItipViewResponse response, -@@ -1906,7 +1926,7 @@ view_response_cb (GtkWidget *widget, Iti - if (status) { - e_cal_component_rescan (pitip->comp); - flag = update_item (pitip, response); -- if (save_schedules && flag) -+ if (save_schedules && flag && is_gw_item (pitip->ical_comp)) - delete_invitation_from_cache = TRUE; - } - break; -@@ -1916,7 +1936,7 @@ view_response_cb (GtkWidget *widget, Iti - if (status) { - e_cal_component_rescan (pitip->comp); - flag = update_item (pitip, response); -- if (save_schedules && flag) -+ if (save_schedules && flag && is_gw_item (pitip->ical_comp)) - delete_invitation_from_cache = TRUE; - - } -@@ -1935,7 +1955,7 @@ view_response_cb (GtkWidget *widget, Iti - if (status) { - e_cal_component_rescan (pitip->comp); - flag = update_item (pitip, response); -- if (save_schedules && flag) -+ if (save_schedules && flag && is_gw_item (pitip->ical_comp)) - delete_invitation_from_cache = TRUE; - } - break; diff --git a/evolution-custom-openldap-includes.patch b/evolution-custom-openldap-includes.patch deleted file mode 100644 index 3ebd522..0000000 --- a/evolution-custom-openldap-includes.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: evolution-2.29.3.1/configure.ac -=================================================================== ---- evolution-2.29.3.1.orig/configure.ac -+++ evolution-2.29.3.1/configure.ac -@@ -605,7 +605,7 @@ if test "$os_win32" != yes; then - - SAVE_CFLAGS="$CFLAGS" - SAVE_LIBS="$LIBS" -- LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED" -+ LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED -I$with_openldap/include" - CFLAGS="$CFLAGS $LDAP_CFLAGS" - LIBS="$LIBS $LDAP_LIBS" - AC_CHECK_FUNCS(ldap_ntlm_bind) diff --git a/evolution.changes b/evolution.changes index 3d471a7..06054dd 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Oct 27 14:46:49 UTC 2012 - dimstar@opensuse.org + +- Remove traces of USE_EVOLDAP defines: evoldap-client2 has been + disabled in 2009 and has since not been maintained. Re-enabling + won't be a good idea. +- Drop evolution-custom-openldap-includes.patch: This patch was + only used to accomodate to find a non-system ldap library. +- Drop bnc-210959-evo-accept-ics.patch: the evolution backend is + unmaintained and as such this patch no longer makes sense. + ------------------------------------------------------------------- Sun Oct 14 10:58:10 UTC 2012 - dimstar@opensuse.org diff --git a/evolution.spec b/evolution.spec index 4bc595a..06a44e9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -16,7 +16,6 @@ # -%define USE_EVOLDAP 0 # wait for port of gtkimageview to gtk3 %define use_gtkimageview 0 @@ -34,20 +33,12 @@ Group: Productivity/Networking/Email/Clients # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859 Url: http://gnome.org/projects/evolution/ Source0: http://download.gnome.org/sources/evolution/3.6/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %%{_libdir}/evoldap/include -Patch15: evolution-custom-openldap-includes.patch # PATCH-NEEDS-REBASE bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. (was PATCH-FIX-UPSTREAM) Patch19: bnc-435722-book-uri-long.patch -# PATCH-NEEDS-REBASE bnc-210959-evo-accept-ics.patch bnc210959 pchenthill@novell.com -- Patch yet to be pushed upstream. (was PATCH-FIX-UPSTREAM) -Patch35: bnc-210959-evo-accept-ics.patch BuildRequires: bison -%if %USE_EVOLDAP -BuildRequires: evoldap2-devel -%else -BuildRequires: openldap2-devel -%endif BuildRequires: fdupes -%if %USE_EVOLDAP || %{need_autogen} +BuildRequires: openldap2-devel +%if %{need_autogen} BuildRequires: gnome-common %endif BuildRequires: gtk-doc @@ -135,25 +126,16 @@ to develop applications that require these. %prep %setup -q translation-update-upstream -%if %USE_EVOLDAP -%patch15 -p1 -%endif # needs-rebase #%%patch19 -# needs-rebase -#%%patch35 %build -%if %USE_EVOLDAP || %{need_autogen} +%if %{need_autogen} NOCONFIGURE=1 gnome-autogen.sh %endif %{configure} \ --disable-scrollkeeper \ -%if %USE_EVOLDAP - --with-openldap=%{_libdir}/evoldap \ -%else --with-openldap=yes \ -%endif --with-krb5=%{_prefix} \ --enable-nss=yes \ --enable-smime=yes \ @@ -180,11 +162,6 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de %suse_update_desktop_file evolution-alarm-notify %find_lang evolution-%evolution_base_version %{?no_lang_C} %find_lang evolution %{?no_lang_C} evolution-%evolution_base_version.lang -%if %USE_EVOLDAP - mv %{buildroot}%{_bindir}/evolution %{buildroot}%{_bindir}/evolution.bin - echo -e "#!/bin/bash\n\nLD_LIBRARY_PATH=%{_libdir}/evoldap/lib exec -a \"%{_bindir}/evolution\" %{_bindir}/evolution.bin \"\$@\"" > %{buildroot}%{_bindir}/evolution - chmod +x %{buildroot}%{_bindir}/evolution -%endif %fdupes %{buildroot} %post