rpm/evolution
SHA256
1
0
Fork 0
forked from pool/evolution
Code Pull Requests Activity

Accepting request 53169 from home:dimstar:branches:GNOME:Factory

Browse Source 
thanks

OBS-URL: https://build.opensuse.org/request/show/53169
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=101
This commit is contained in:
Vincent Untz 2010-11-17 15:15:24 +00:00 committed by Git OBS Bridge
parent cabe259146
commit 095c99833f
6 changed files with 58 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bnc-433448-backup-restore-fails.patch
View File

@ -1,20 +0,0 @@
Index: plugins/backup-restore/backup.c
===================================================================
--- plugins/backup-restore/backup.c.orig
+++ plugins/backup-restore/backup.c
@@ -35,6 +35,7 @@
#define EVOUSERDATADIR_MAGIC "#EVO_USERDATADIR#"
#define EVOLUTION "evolution"
+#define PKILL "/usr/bin/pkill"
#define EVOLUTION_DIR "$HOME/.evolution/"
#define EVOLUTION_DIR_BACKUP "$HOME/.evolution-old/"
#define GCONF_DUMP_FILE "backup-restore-gconf.xml"
@@ -267,6 +268,7 @@ restore (const gchar *filename)
replace_in_file (GCONF_DUMP_PATH, EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
+ run_cmd (PKILL " gconf");
run_cmd ("gconftool-2 --load " GCONF_DUMP_PATH);
CANCEL (complete);

3
evolution-2.32.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:61d0e45a9f23292d41155332d57d325b44b198189133b64f929cd75e1dc98841
size 31877012

3
evolution-2.32.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f6f904b5a2c6cf51f9c44317fc1990b07593eba54957c3924c2db0a235117a3
size 31875075

13
evolution-mono2.patch Normal file
View File

@ -0,0 +1,13 @@
Index: evolution-2.32.1/configure.ac
===================================================================
--- evolution-2.32.1.orig/configure.ac
+++ evolution-2.32.1/configure.ac
@@ -766,7 +766,7 @@ AC_ARG_ENABLE([mono],
[Add Mono embedded hooks.]),
[enable_mono=$enableval],[enable_mono=no])
if test "x${enable_mono}" = "xyes"; then
- PKG_CHECK_MODULES([MONO], ["mono"])
+ PKG_CHECK_MODULES([MONO], ["mono-2"])
AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled])
fi
AC_SUBST(MONO_CFLAGS)

29
evolution.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Tue Nov 16 09:20:46 CET 2010 - dimstar@opensuse.org
- Update to version 2.32.1:
+ Drop accessibility support for ECellText.
+ Workaround crash when pasting nothing into html message
composer
+ stock_appontment-reminder icons renamed
+ Fix build on platforms when ngettext is a macro
+ Memory leaks around g_value_set_string
+ MailFolderCache notifies in reverse order
+ Calendar's "Open Web Page" actions doesn't work
+ Bugs fixed: bgo#632293, bgo#634088, bgo#628139, bgo#632941,
bgo#632278, bgo#632199, bgo#592045, bgo#632870, bgo#597567,
bgo#631526, bgo#567265, bgo#630518, bgo#631968, bgo#604981,
bgo#632171, bgo#630375, bgo#617611, bgo#619387, bgo#552121,
bgo#631588, bgo#617953, bgo#618102, bgo#211593, bgo#500591,
bgo#630295, bgo#629825, bgo#615835, bgo#626066, bgo#629462,
bgo#629799, bgo#630294, bgo#628522, bgo#630700, bgo#629266,
bgo#604080, bgo#629934, bgo#629636, bgo#629480, bgo#629150,
bgo#629972.
+ Updated translations.
- Drop bnc-433448-backup-restore-fails.patch. As per bgo#557066,
this was fixed in evo 2.25.1.
- BuildRequire libmono-2_0-devel (and temporarly libmono-2_0-1) on
openSUSE 11.4.
- Add evolution-mono2.patch to fix build against lates mono
packages in openSUSE 11.4.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 5 15:49:02 CEST 2010 - vuntz@opensuse.org Tue Oct 5 15:49:02 CEST 2010 - vuntz@opensuse.org

18
evolution.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package evolution (Version 2.32.0) # spec file for package evolution (Version 2.32.1)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -68,7 +68,7 @@ License: LGPLv2.0 ; LGPLv3
Group: Productivity/Networking/Email/Clients Group: Productivity/Networking/Email/Clients
# 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 2.32 %define evolution_base_version 2.32
Version: 2.32.0 Version: 2.32.1
Release: 1 Release: 1
# FIXME: check with upstream/meego if we want to enable clutter for express mode # FIXME: check with upstream/meego if we want to enable clutter for express mode
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
@ -81,8 +81,6 @@ Patch15: evolution-custom-openldap-includes.patch
Patch18: bnc-435668-hide-accept.patch Patch18: bnc-435668-hide-accept.patch
# PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column.
Patch19: bnc-435722-book-uri-long.patch Patch19: bnc-435722-book-uri-long.patch
# PATCH-FIX-OPENSUSE bnc-433448-backup-restore-fails.patch bnc433448 abharath@suse.de -- Not required upstream.
Patch25: bnc-433448-backup-restore-fails.patch
# PATCH-FIX-UPSTREAM bnc-210959-evo-accept-ics.patch bnc210959 pchenthill@novell.com -- Patch yet to be pushed upstream. # PATCH-FIX-UPSTREAM bnc-210959-evo-accept-ics.patch bnc210959 pchenthill@novell.com -- Patch yet to be pushed upstream.
Patch35: bnc-210959-evo-accept-ics.patch Patch35: bnc-210959-evo-accept-ics.patch
# PATCH-NEEDS-REBASE bnc-449888-handle-no-workspace.patch bnc449888 pchenthill@suse.de -- Patch needs to be upstreamed. (WAS: PATCH-FIX-UPSTREAM) # PATCH-NEEDS-REBASE bnc-449888-handle-no-workspace.patch bnc449888 pchenthill@suse.de -- Patch needs to be upstreamed. (WAS: PATCH-FIX-UPSTREAM)
@ -91,6 +89,8 @@ Patch42: bnc-449888-handle-no-workspace.patch
Patch53: bnc-440634-forwarded-hide-accept-decline.patch Patch53: bnc-440634-forwarded-hide-accept-decline.patch
# PATCH-NEEDS-REBASE bnc-445996-address-conflict.patch bnc445996 shashish@suse.de -- Needs to be moved out of glade files. (was PATCH-FIX-SLED) # PATCH-NEEDS-REBASE bnc-445996-address-conflict.patch bnc445996 shashish@suse.de -- Needs to be moved out of glade files. (was PATCH-FIX-SLED)
Patch54: bnc-445996-address-conflict.patch Patch54: bnc-445996-address-conflict.patch
# PATCH-FIX-UPSTREAM evolution-mono2.patch dimstar@opensuse.org -- Build against mono-2. Patch is not ready to be upstreamed in this form.
Patch55: evolution-mono2.patch
Url: http://gnome.org/projects/evolution/ Url: http://gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: bogofilter Recommends: bogofilter
@ -145,7 +145,13 @@ BuildRequires: gconf-sharp2
BuildRequires: glib-sharp2 BuildRequires: glib-sharp2
BuildRequires: gnome-sharp2 BuildRequires: gnome-sharp2
BuildRequires: gtk-sharp2 BuildRequires: gtk-sharp2
%if 0%{?suse_version} > 1130
# FIXME: Check if libmono-2_0-1 is dragged in by libmono-2_0-devel, then remove this BR.
BuildRequires: libmono-2_0-1
BuildRequires: libmono-2_0-devel
%else
BuildRequires: mono-devel BuildRequires: mono-devel
%endif
BuildRequires: ndesk-dbus-glib-devel BuildRequires: ndesk-dbus-glib-devel
%description mono-plugins %description mono-plugins
@ -178,13 +184,15 @@ translation-update-upstream
# NEEDS REBASE # NEEDS REBASE
#%patch18 #%patch18
%patch19 %patch19
%patch25
%patch35 %patch35
# NEEDS-REBASE # NEEDS-REBASE
#%patch42 -p1 #%patch42 -p1
# NEEDS REBASE # NEEDS REBASE
#%patch53 #%patch53
#%patch54 #%patch54
%if %{?suse_version} > 1130
%patch55 -p1
%endif
%build %build
autoreconf -f -i autoreconf -f -i