mirror of
https://abf.rosa.ru/djam/evolution-exchange.git
synced 2025-02-23 09:52:47 +00:00
LOG New version 3.4.4 (sync with Cooker)
This commit is contained in:
parent
f6488a80fd
commit
df42cab872
3 changed files with 65 additions and 369 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,2 +1,2 @@
|
|||
sources:
|
||||
"evolution-exchange-2.32.3.tar.bz2": b7b6896d98eb3dba9d2a675afcc2b984804f6cc4
|
||||
"evolution-exchange-3.4.4.tar.xz": 52993fda41a2c15c894d1f295b8e0d1def35f98b
|
||||
|
|
|
@ -1,312 +0,0 @@
|
|||
From e9596e5a2f5e2c1bc5c8700eafc3ead17f819020 Mon Sep 17 00:00:00 2001
|
||||
From: Milan Crha <mcrha@redhat.com>
|
||||
Date: Tue, 26 Oct 2010 08:38:22 +0000
|
||||
Subject: Be able to compile against Gtk+ 2.23.0
|
||||
|
||||
---
|
||||
diff --git a/eplugin/exchange-delegates-user.c b/eplugin/exchange-delegates-user.c
|
||||
index a8bf13b..6487d12 100644
|
||||
--- a/eplugin/exchange-delegates-user.c
|
||||
+++ b/eplugin/exchange-delegates-user.c
|
||||
@@ -43,6 +43,8 @@
|
||||
|
||||
#include <string.h>
|
||||
|
||||
+#include "gtk-compat.h"
|
||||
+
|
||||
#define EXCHANGE_DELEGATES_USER_CUSTOM -3
|
||||
/* Can't use E2K_PERMISSIONS_ROLE_CUSTOM, because it's -1, which
|
||||
* means "end of list" to e_dialog_combo_box_get/set
|
||||
@@ -130,7 +132,7 @@ static void
|
||||
set_perms (GtkWidget *combobox, E2kPermissionsRole role)
|
||||
{
|
||||
if (!is_delegate_role (role)) {
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (combobox), _("Custom"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combobox), _("Custom"));
|
||||
role = EXCHANGE_DELEGATES_USER_CUSTOM;
|
||||
}
|
||||
|
||||
@@ -297,45 +299,45 @@ exchange_delegates_user_edit (ExchangeAccount *account,
|
||||
gtk_label_set_justify (GTK_LABEL (contact_label), GTK_JUSTIFY_CENTER);
|
||||
gtk_misc_set_alignment (GTK_MISC (contact_label), 0, 0.5);
|
||||
|
||||
- calendar_perms_combobox = gtk_combo_box_new_text ();
|
||||
+ calendar_perms_combobox = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (calendar_perms_combobox);
|
||||
gtk_table_attach (GTK_TABLE (folders_table), calendar_perms_combobox, 1, 2, 0, 1,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("None"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("Reviewer (read-only)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("Author (read, create)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (calendar_perms_combobox), _("Editor (read, create, edit)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("None"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("Reviewer (read-only)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("Author (read, create)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (calendar_perms_combobox), _("Editor (read, create, edit)"));
|
||||
|
||||
- task_perms_combobox = gtk_combo_box_new_text ();
|
||||
+ task_perms_combobox = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (task_perms_combobox);
|
||||
gtk_table_attach (GTK_TABLE (folders_table), task_perms_combobox, 1, 2, 1, 2,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("None"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("Reviewer (read-only)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("Author (read, create)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (task_perms_combobox), _("Editor (read, create, edit)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("None"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("Reviewer (read-only)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("Author (read, create)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (task_perms_combobox), _("Editor (read, create, edit)"));
|
||||
|
||||
- inbox_perms_combobox = gtk_combo_box_new_text ();
|
||||
+ inbox_perms_combobox = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (inbox_perms_combobox);
|
||||
gtk_table_attach (GTK_TABLE (folders_table), inbox_perms_combobox, 1, 2, 2, 3,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("None"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("Reviewer (read-only)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("Author (read, create)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (inbox_perms_combobox), _("Editor (read, create, edit)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("None"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("Reviewer (read-only)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("Author (read, create)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (inbox_perms_combobox), _("Editor (read, create, edit)"));
|
||||
|
||||
- contact_perms_combobox = gtk_combo_box_new_text ();
|
||||
+ contact_perms_combobox = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (contact_perms_combobox);
|
||||
gtk_table_attach (GTK_TABLE (folders_table), contact_perms_combobox, 1, 2, 3, 4,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("None"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("Reviewer (read-only)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("Author (read, create)"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (contact_perms_combobox), _("Editor (read, create, edit)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("None"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("Reviewer (read-only)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("Author (read, create)"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (contact_perms_combobox), _("Editor (read, create, edit)"));
|
||||
|
||||
delegate_mail = gtk_check_button_new_with_mnemonic (_("_Summarize permissions"));
|
||||
gtk_widget_show (delegate_mail);
|
||||
diff --git a/eplugin/exchange-folder-subscription.c b/eplugin/exchange-folder-subscription.c
|
||||
index 2067f5c..d61a7eb 100644
|
||||
--- a/eplugin/exchange-folder-subscription.c
|
||||
+++ b/eplugin/exchange-folder-subscription.c
|
||||
@@ -38,6 +38,7 @@
|
||||
#include "exchange-config-listener.h"
|
||||
#include "exchange-folder-subscription.h"
|
||||
#include "exchange-operations.h"
|
||||
+#include "gtk-compat.h"
|
||||
|
||||
static void
|
||||
user_response (ENameSelectorDialog *name_selector_dialog, gint response, gpointer data)
|
||||
@@ -63,7 +64,7 @@ setup_name_selector (GtkWidget *placeholder, GtkWidget *button_user, ENameSelect
|
||||
ENameSelectorDialog *name_selector_dialog;
|
||||
GtkWidget *widget;
|
||||
|
||||
- g_assert (GTK_IS_CONTAINER (placeholder));
|
||||
+ g_return_val_if_fail (GTK_IS_CONTAINER (placeholder), NULL);
|
||||
|
||||
name_selector = e_name_selector_new ();
|
||||
|
||||
@@ -89,7 +90,7 @@ setup_name_selector (GtkWidget *placeholder, GtkWidget *button_user, ENameSelect
|
||||
static void
|
||||
setup_folder_name_combo (GtkWidget *widget, const gchar *fname)
|
||||
{
|
||||
- GtkComboBox *combo;
|
||||
+ GtkComboBoxText *combo;
|
||||
const gchar *strings[] = {
|
||||
"Calendar",
|
||||
"Inbox",
|
||||
@@ -100,13 +101,13 @@ setup_folder_name_combo (GtkWidget *widget, const gchar *fname)
|
||||
};
|
||||
gint i;
|
||||
|
||||
- combo = GTK_COMBO_BOX (widget);
|
||||
- g_assert (GTK_IS_COMBO_BOX_ENTRY (combo));
|
||||
+ combo = GTK_COMBO_BOX_TEXT (widget);
|
||||
+ g_return_if_fail (GTK_IS_COMBO_BOX_TEXT (combo));
|
||||
|
||||
- gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (combo)));
|
||||
+ gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (combo))));
|
||||
|
||||
for (i = 0; strings[i] != NULL; i++)
|
||||
- gtk_combo_box_append_text (combo, strings[i]);
|
||||
+ gtk_combo_box_text_append_text (combo, strings[i]);
|
||||
|
||||
gtk_entry_set_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (combo))), fname);
|
||||
}
|
||||
@@ -139,11 +140,11 @@ user_name_entry_changed_callback (GtkEditable *editable, gpointer data)
|
||||
static void
|
||||
setup_server_combobox (GtkWidget *widget, gchar *mail_account)
|
||||
{
|
||||
- g_return_if_fail (GTK_IS_COMBO_BOX (widget));
|
||||
+ g_return_if_fail (GTK_IS_COMBO_BOX_TEXT (widget));
|
||||
|
||||
gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (widget))));
|
||||
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (widget), mail_account);
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), mail_account);
|
||||
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
|
||||
|
||||
/* FIXME: Default to the current storage in the shell view. */
|
||||
@@ -345,13 +346,29 @@ create_folder_subscription_dialog (ExchangeAccount *account, const gchar *fname)
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (0), 0, 0);
|
||||
|
||||
+#if GTK_CHECK_VERSION(2,23,0)
|
||||
+ /* FIXME Rewrite this when removing the version check. */
|
||||
+ {
|
||||
+ GtkListStore *store;
|
||||
+
|
||||
+ store = gtk_list_store_new (1, G_TYPE_STRING);
|
||||
+ folder_name_combo = g_object_new (
|
||||
+ GTK_TYPE_COMBO_BOX,
|
||||
+ "model", store,
|
||||
+ "has-entry", TRUE,
|
||||
+ "entry-text-column", 0,
|
||||
+ NULL);
|
||||
+ g_object_unref (store);
|
||||
+ }
|
||||
+#else
|
||||
folder_name_combo = gtk_combo_box_entry_new_text ();
|
||||
+#endif
|
||||
gtk_widget_show (folder_name_combo);
|
||||
gtk_table_attach (GTK_TABLE (table1), folder_name_combo, 1, 2, 2, 3,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
|
||||
- server_combobox = gtk_combo_box_new_text ();
|
||||
+ server_combobox = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (server_combobox);
|
||||
gtk_table_attach (GTK_TABLE (table1), server_combobox, 1, 2, 0, 1,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
diff --git a/eplugin/exchange-permissions-dialog.c b/eplugin/exchange-permissions-dialog.c
|
||||
index 51d1398..82b2cfb 100644
|
||||
--- a/eplugin/exchange-permissions-dialog.c
|
||||
+++ b/eplugin/exchange-permissions-dialog.c
|
||||
@@ -42,6 +42,8 @@
|
||||
#include <e-util/e-dialog-utils.h>
|
||||
#include <e-util/e-alert-dialog.h>
|
||||
|
||||
+#include "gtk-compat.h"
|
||||
+
|
||||
struct _ExchangePermissionsDialogPrivate {
|
||||
ExchangeAccount *account;
|
||||
gchar *base_uri, *folder_path;
|
||||
@@ -542,14 +544,14 @@ display_role (ExchangePermissionsDialog *dialog)
|
||||
|
||||
if (role == E2K_PERMISSIONS_ROLE_CUSTOM) {
|
||||
if (dialog->priv->custom_added == FALSE) {
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->priv->role_optionmenu), _("Custom"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (dialog->priv->role_optionmenu), _("Custom"));
|
||||
dialog->priv->custom_added = TRUE;
|
||||
}
|
||||
role = E2K_PERMISSIONS_ROLE_NUM_ROLES;
|
||||
}
|
||||
else {
|
||||
if (dialog->priv->custom_added) {
|
||||
- gtk_combo_box_remove_text (GTK_COMBO_BOX (dialog->priv->role_optionmenu), E2K_PERMISSIONS_ROLE_NUM_ROLES);
|
||||
+ gtk_combo_box_text_remove (GTK_COMBO_BOX_TEXT (dialog->priv->role_optionmenu), E2K_PERMISSIONS_ROLE_NUM_ROLES);
|
||||
dialog->priv->custom_added = FALSE;
|
||||
}
|
||||
}
|
||||
@@ -680,11 +682,11 @@ exchange_permissions_role_optionmenu_new (void)
|
||||
const gchar **roles;
|
||||
gint role;
|
||||
|
||||
- menu = gtk_combo_box_new_text ();
|
||||
+ menu = gtk_combo_box_text_new ();
|
||||
roles = g_new (const gchar *, E2K_PERMISSIONS_ROLE_NUM_ROLES + 1);
|
||||
for (role = 0; role < E2K_PERMISSIONS_ROLE_NUM_ROLES; role++) {
|
||||
roles[role] = e2k_permissions_role_get_name (role);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (menu), roles[role]);
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (menu), roles[role]);
|
||||
}
|
||||
|
||||
roles[role] = NULL;
|
||||
diff --git a/eplugin/exchange-send-options.c b/eplugin/exchange-send-options.c
|
||||
index 31b6a56..47c6cf0 100644
|
||||
--- a/eplugin/exchange-send-options.c
|
||||
+++ b/eplugin/exchange-send-options.c
|
||||
@@ -32,6 +32,7 @@
|
||||
#include <e-util/e-alert-dialog.h>
|
||||
|
||||
#include "exchange-send-options.h"
|
||||
+#include "gtk-compat.h"
|
||||
|
||||
G_DEFINE_TYPE (ExchangeSendOptionsDialog, exchange_sendoptions_dialog, G_TYPE_OBJECT)
|
||||
|
||||
@@ -385,24 +386,24 @@ exchange_sendoptions_dialog_run (ExchangeSendOptionsDialog *sod, GtkWidget *pare
|
||||
(GtkAttachOptions) (0), 0, 0);
|
||||
gtk_misc_set_alignment (GTK_MISC (sensitivity_label), 0, 0.5);
|
||||
|
||||
- sensitivity_combo_box = gtk_combo_box_new_text ();
|
||||
+ sensitivity_combo_box = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (sensitivity_combo_box);
|
||||
gtk_table_attach (GTK_TABLE (msg_settings_table), sensitivity_combo_box, 1, 2, 1, 2,
|
||||
(GtkAttachOptions) (GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Normal"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Personal"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Private"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (sensitivity_combo_box), _("Confidential"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Normal"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Personal"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Private"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (sensitivity_combo_box), _("Confidential"));
|
||||
|
||||
- imp_combo_box = gtk_combo_box_new_text ();
|
||||
+ imp_combo_box = gtk_combo_box_text_new ();
|
||||
gtk_widget_show (imp_combo_box);
|
||||
gtk_table_attach (GTK_TABLE (msg_settings_table), imp_combo_box, 1, 2, 0, 1,
|
||||
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
|
||||
(GtkAttachOptions) (GTK_FILL), 0, 0);
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (imp_combo_box), _("Normal"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (imp_combo_box), _("High"));
|
||||
- gtk_combo_box_append_text (GTK_COMBO_BOX (imp_combo_box), _("Low"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (imp_combo_box), _("Normal"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (imp_combo_box), _("High"));
|
||||
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (imp_combo_box), _("Low"));
|
||||
|
||||
del_enabled_check = gtk_check_button_new_with_mnemonic (_("Send as Delegate"));
|
||||
gtk_widget_show (del_enabled_check);
|
||||
diff --git a/eplugin/gtk-compat.h b/eplugin/gtk-compat.h
|
||||
new file mode 100644
|
||||
index 0000000..3505e66
|
||||
--- a/dev/null
|
||||
+++ b/eplugin/gtk-compat.h
|
||||
@@ -0,0 +1,27 @@
|
||||
+#ifndef __GTK_COMPAT_H__
|
||||
+#define __GTK_COMPAT_H__
|
||||
+
|
||||
+#include <gtk/gtk.h>
|
||||
+
|
||||
+/* Provide a GTK+ compatibility layer. */
|
||||
+
|
||||
+#if !GTK_CHECK_VERSION (2,23,0)
|
||||
+#define gtk_combo_box_text_new gtk_combo_box_new_text
|
||||
+#define gtk_combo_box_text_append_text gtk_combo_box_append_text
|
||||
+#define gtk_combo_box_text_remove gtk_combo_box_remove_text
|
||||
+#define gtk_combo_box_text_prepend_text gtk_combo_box_prepend_text
|
||||
+#define gtk_combo_box_text_get_active_text gtk_combo_box_get_active_text
|
||||
+#define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
|
||||
+#define GTK_IS_COMBO_BOX_TEXT GTK_IS_COMBO_BOX
|
||||
+#define GtkComboBoxText GtkComboBox
|
||||
+#endif
|
||||
+
|
||||
+#if GTK_CHECK_VERSION (2,23,0)
|
||||
+#define GTK_COMBO_BOX_ENTRY GTK_COMBO_BOX
|
||||
+#define GTK_IS_COMBO_BOX_ENTRY GTK_IS_COMBO_BOX
|
||||
+#else
|
||||
+#define gtk_combo_box_set_entry_text_column \
|
||||
+ gtk_combo_box_entry_set_text_column
|
||||
+#endif
|
||||
+
|
||||
+#endif /* __GTK_COMPAT_H__ */
|
||||
--
|
||||
cgit v0.9
|
|
@ -1,6 +1,6 @@
|
|||
%define major_version 2.32
|
||||
%define evolution_version 2.32.2
|
||||
%define eds_version 2.32.2
|
||||
%define major_version 3.4
|
||||
%define evolution_version 3.4.1
|
||||
%define eds_version 3.4.1
|
||||
%define api_version 1.2
|
||||
|
||||
%define build_mono 1
|
||||
|
@ -8,35 +8,35 @@
|
|||
%define build_mono 0
|
||||
%endif
|
||||
|
||||
Name: evolution-exchange
|
||||
Summary: Exchange Connector for Evolution
|
||||
Version: 2.32.3
|
||||
Release: %mkrel 3
|
||||
License: GPLv2
|
||||
Name: evolution-exchange
|
||||
Version: 3.4.4
|
||||
Release: 1
|
||||
License: GPLv2
|
||||
Group: Networking/Mail
|
||||
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.bz2
|
||||
Patch0: evolution-exchange-2.32.2-gtk-2.24.patch
|
||||
URL: http://projects.gnome.org/evolution/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
URL: http://projects.gnome.org/evolution/
|
||||
Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{name}-%{version}.tar.xz
|
||||
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: intltool
|
||||
BuildRequires: db53-devel
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: openldap-devel
|
||||
BuildRequires: pkgconfig(evolution-shell-3.0)
|
||||
BuildRequires: pkgconfig(gconf-2.0)
|
||||
BuildRequires: pkgconfig(gnome-desktop-3.0)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libedata-book-1.2)
|
||||
BuildRequires: pkgconfig(libebackend-1.2)
|
||||
BuildRequires: pkgconfig(libedata-cal-1.2)
|
||||
BuildRequires: pkgconfig(libedataserverui-3.0)
|
||||
%if %{build_mono}
|
||||
BuildRequires: libmono-devel
|
||||
%endif
|
||||
|
||||
# (fc) 0.8-5mdk implicit dependency is not enough
|
||||
Requires: evolution >= %{evolution_version}
|
||||
BuildRequires: evolution-devel >= %{evolution_version}
|
||||
BuildRequires: evolution-data-server-devel >= %eds_version
|
||||
BuildRequires: libGConf2-devel GConf2
|
||||
BuildRequires: db-devel
|
||||
BuildRequires: openldap-devel
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: automake
|
||||
BuildRequires: intltool
|
||||
BuildRequires: gnome-common
|
||||
%if %{build_mono}
|
||||
BuildRequires: libmono-devel
|
||||
%endif
|
||||
BuildRequires: gtk-doc
|
||||
#gw another .la dep
|
||||
BuildRequires: gnome-desktop-devel
|
||||
Obsoletes: ximian-connector
|
||||
Provides: ximian-connector
|
||||
|
||||
%description
|
||||
This package is a connector to allow access to Exchange server
|
||||
|
@ -46,52 +46,60 @@ Currently, only Exchange 2000 and 2003 are supported.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
export CPPFLAGS="$CPPFLAGS -I%_includedir/libical"
|
||||
%configure2_5x --with-openldap=yes --with-static-ldap=no --enable-gtk-doc --disable-static
|
||||
export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libical"
|
||||
%configure2_5x \
|
||||
--with-openldap=yes \
|
||||
--with-static-ldap=no \
|
||||
--enable-gtk-doc \
|
||||
--disable-static
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%makeinstall_std
|
||||
|
||||
|
||||
#remove unpackaged files
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{major_version}/*.{a,la} \
|
||||
$RPM_BUILD_ROOT%{_libdir}/evolution-data-server-%{api_version}/camel-providers/*.{a,la} \
|
||||
$RPM_BUILD_ROOT%{_libdir}/evolution/%{major_version}/evolution-mail-importers/*.{a,la} \
|
||||
$RPM_BUILD_ROOT%{_libdir}/evolution/%{major_version}/evolution-calendar-importers/*.{a,la}
|
||||
rm -f %{buildroot}%{_libdir}/evolution/%{major_version}/*.{a,la} \
|
||||
%{buildroot}%{_libdir}/evolution-data-server-%{api_version}/camel-providers/*.{a,la} \
|
||||
%{buildroot}%{_libdir}/evolution/%{major_version}/evolution-mail-importers/*.{a,la} \
|
||||
%{buildroot}%{_libdir}/evolution/%{major_version}/evolution-calendar-importers/*.{a,la}
|
||||
|
||||
%{find_lang} %{name}-%{major_version} --with-gnome
|
||||
|
||||
%clean
|
||||
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
%post_install_gconf_schemas apps_exchange_addressbook-%{major_version}
|
||||
%find_lang %{name}-%{major_version} --with-gnome
|
||||
|
||||
%preun
|
||||
%preun_uninstall_gconf_schemas apps_exchange_addressbook-%{major_version}
|
||||
|
||||
%files -f %{name}-%{major_version}.lang
|
||||
%defattr(-, root, root)
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README
|
||||
%_sysconfdir/gconf/schemas/apps_exchange_addressbook-%{major_version}.schemas
|
||||
%{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{major_version}.schemas
|
||||
%{_bindir}/*
|
||||
%{_libdir}/evolution-data-server-%{api_version}/camel-providers/*.so
|
||||
%{_libdir}/evolution-data-server-%{api_version}/camel-providers/*.urls
|
||||
%{_libdir}/evolution-data-server-%{api_version}/extensions/*
|
||||
%_libdir/evolution/%major_version/plugins/*org-gnome-exchange*
|
||||
%{_libdir}/evolution/%{major_version}/plugins/*org-gnome-exchange*
|
||||
%{_libdir}/evolution-exchange/%{major_version}
|
||||
%{_libdir}/evolution-data-server/addressbook-backends/libebookbackendexchange.so
|
||||
%{_libdir}/evolution-data-server/calendar-backends/libecalbackendexchange.so
|
||||
%{_libdir}/evolution-data-server/camel-providers/libcamelexchange.*
|
||||
%{_datadir}/evolution-exchange
|
||||
%_datadir/gtk-doc/html/%name
|
||||
%_datadir/evolution/%major_version/errors/*.error
|
||||
%{_datadir}/gtk-doc/html/%{name}
|
||||
%{_datadir}/evolution/%{major_version}/errors/*.error
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon May 23 2011 Funda Wang <fwang@mandriva.org> 2.32.3-2mdv2011.0
|
||||
* Mon Aug 13 2012 Matthew Dawkins <mattydaw@mandriva.org> 3.4.4-1
|
||||
+ Revision: 814456
|
||||
- update to new version 3.4.4
|
||||
|
||||
* Tue Jun 19 2012 Matthew Dawkins <mattydaw@mandriva.org> 3.4.3-1
|
||||
+ Revision: 806249
|
||||
- update to new version 3.4.3
|
||||
|
||||
* Wed May 09 2012 Crispin Boylan <crisb@mandriva.org> 3.4.1-1
|
||||
+ Revision: 797844
|
||||
- New release
|
||||
|
||||
* Mon May 23 2011 Funda Wang <fwang@mandriva.org> 2.32.3-2
|
||||
+ Revision: 677667
|
||||
- rebuild to add gconftool as req
|
||||
|
||||
|
@ -215,7 +223,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{major_version}/*.{a,la} \
|
|||
+ Revision: 458861
|
||||
- Release 2.28.1
|
||||
|
||||
* Fri Sep 25 2009 Olivier Blin <oblin@mandriva.com> 2.28.0-2mdv2010.0
|
||||
* Fri Sep 25 2009 Olivier Blin <blino@mandriva.org> 2.28.0-2mdv2010.0
|
||||
+ Revision: 448901
|
||||
- disable mono on mips & arm (from Arnaud Patard)
|
||||
|
||||
|
@ -400,7 +408,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{major_version}/*.{a,la} \
|
|||
+ Revision: 138467
|
||||
- rebuilt against bdb 4.6.x and openldap 2.4.x libs
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
+ Olivier Blin <blino@mandriva.org>
|
||||
- restore BuildRoot
|
||||
|
||||
* Tue Dec 18 2007 Götz Waschk <waschk@mandriva.org> 2.21.4-1mdv2008.1
|
||||
|
|
Loading…
Add table
Reference in a new issue