Accepting request 142083 from GNOME:Factory
Push G:F OBS-URL: https://build.opensuse.org/request/show/142083 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=133
This commit is contained in:
commit
106d01c4da
@ -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;
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:7aa0730d6815cc44dbde75b4464697dd9d51584f48e9e03e86c2e5ca5a97a521
|
|
||||||
size 12009744
|
|
3
evolution-3.6.2.tar.xz
Normal file
3
evolution-3.6.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:40b326c63abc33ccc1393c9e3b60c747234ab14a46fc4690255b523942ea8983
|
||||||
|
size 12006684
|
@ -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)
|
|
@ -1,3 +1,31 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 13 11:04:29 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Update to version 3.6.2:
|
||||||
|
+ evolution.convert: Remove leftover "force-message-limit" entry.
|
||||||
|
+ Remove "Disable Account" menu item for GOA-based accounts.
|
||||||
|
+ Fixed squished labels on Identity page of Account Assistant.
|
||||||
|
+ EMailConfigAssistant: Make revising auto-configuration easier.
|
||||||
|
+ Preferences and contact editor too large for small screens
|
||||||
|
(bgo#267787, bgo#317153)
|
||||||
|
+ Bugs fixed: bgo#310978, bgo#317153, bgo#588959, bgo#627244,
|
||||||
|
bgo#663844, bgo#663844, bgo#680497, bgo#685262, bgo#685786,
|
||||||
|
bgo#686278, bgo#686325, bgo#686785, bgo#686813, bgo#687010,
|
||||||
|
bgo#687060, bgo#687137, bgo#687155, bgo#687400, bgo#687442,
|
||||||
|
bgo#688084.
|
||||||
|
+ Updated translations.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Sun Oct 14 10:58:10 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define USE_EVOLDAP 0
|
|
||||||
# wait for port of gtkimageview to gtk3
|
# wait for port of gtkimageview to gtk3
|
||||||
%define use_gtkimageview 0
|
%define use_gtkimageview 0
|
||||||
|
|
||||||
@ -25,7 +24,7 @@
|
|||||||
Name: evolution
|
Name: evolution
|
||||||
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
|
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
|
||||||
%define evolution_base_version 3.6
|
%define evolution_base_version 3.6
|
||||||
Version: 3.6.1
|
Version: 3.6.2
|
||||||
Release: 0
|
Release: 0
|
||||||
# FIXME: check if note on license is still valid (comment before license)
|
# FIXME: check if note on license is still valid (comment before license)
|
||||||
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
|
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
|
||||||
@ -34,20 +33,12 @@ Group: Productivity/Networking/Email/Clients
|
|||||||
# NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
|
# NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
|
||||||
Url: http://gnome.org/projects/evolution/
|
Url: http://gnome.org/projects/evolution/
|
||||||
Source0: http://download.gnome.org/sources/evolution/3.6/%{name}-%{version}.tar.xz
|
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)
|
# 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
|
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
|
BuildRequires: bison
|
||||||
%if %USE_EVOLDAP
|
|
||||||
BuildRequires: evoldap2-devel
|
|
||||||
%else
|
|
||||||
BuildRequires: openldap2-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
%if %USE_EVOLDAP || %{need_autogen}
|
BuildRequires: openldap2-devel
|
||||||
|
%if %{need_autogen}
|
||||||
BuildRequires: gnome-common
|
BuildRequires: gnome-common
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: gtk-doc
|
BuildRequires: gtk-doc
|
||||||
@ -135,25 +126,16 @@ to develop applications that require these.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
translation-update-upstream
|
translation-update-upstream
|
||||||
%if %USE_EVOLDAP
|
|
||||||
%patch15 -p1
|
|
||||||
%endif
|
|
||||||
# needs-rebase
|
# needs-rebase
|
||||||
#%%patch19
|
#%%patch19
|
||||||
# needs-rebase
|
|
||||||
#%%patch35
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if %USE_EVOLDAP || %{need_autogen}
|
%if %{need_autogen}
|
||||||
NOCONFIGURE=1 gnome-autogen.sh
|
NOCONFIGURE=1 gnome-autogen.sh
|
||||||
%endif
|
%endif
|
||||||
%{configure} \
|
%{configure} \
|
||||||
--disable-scrollkeeper \
|
--disable-scrollkeeper \
|
||||||
%if %USE_EVOLDAP
|
|
||||||
--with-openldap=%{_libdir}/evoldap \
|
|
||||||
%else
|
|
||||||
--with-openldap=yes \
|
--with-openldap=yes \
|
||||||
%endif
|
|
||||||
--with-krb5=%{_prefix} \
|
--with-krb5=%{_prefix} \
|
||||||
--enable-nss=yes \
|
--enable-nss=yes \
|
||||||
--enable-smime=yes \
|
--enable-smime=yes \
|
||||||
@ -180,11 +162,6 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
|
|||||||
%suse_update_desktop_file evolution-alarm-notify
|
%suse_update_desktop_file evolution-alarm-notify
|
||||||
%find_lang evolution-%evolution_base_version %{?no_lang_C}
|
%find_lang evolution-%evolution_base_version %{?no_lang_C}
|
||||||
%find_lang evolution %{?no_lang_C} evolution-%evolution_base_version.lang
|
%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}
|
%fdupes %{buildroot}
|
||||||
|
|
||||||
%post
|
%post
|
||||||
|
Loading…
Reference in New Issue
Block a user