Update to 3.3.2
This commit is contained in:
parent
43fc9093ca
commit
33d5e36a91
1
.gitignore
vendored
1
.gitignore
vendored
@ -24,3 +24,4 @@ evolution-2.31.5.tar.bz2
|
||||
/evolution-3.1.92.tar.xz
|
||||
/evolution-3.2.0.tar.xz
|
||||
/evolution-3.3.1.tar.xz
|
||||
/evolution-3.3.2.tar.xz
|
||||
|
@ -1,44 +0,0 @@
|
||||
diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c
|
||||
index 99e0b4a..91e3690 100644
|
||||
--- a/capplet/anjal-settings-main.c
|
||||
+++ b/capplet/anjal-settings-main.c
|
||||
@@ -167,8 +167,10 @@ main (gint argc,
|
||||
if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error))
|
||||
g_error ("%s", error->message);
|
||||
|
||||
+ #if !GLIB_CHECK_VERSION(2,31,0)
|
||||
if (!g_thread_get_initialized ())
|
||||
g_thread_init (NULL);
|
||||
+ #endif
|
||||
|
||||
e_passwords_init ();
|
||||
categories_icon_theme_hack ();
|
||||
diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c
|
||||
index 0b14494..0b15271 100644
|
||||
--- a/capplet/settings/mail-guess-servers.c
|
||||
+++ b/capplet/settings/mail-guess-servers.c
|
||||
@@ -343,7 +343,9 @@ main (gint argc,
|
||||
gchar **argv)
|
||||
{
|
||||
EmailProvider *provider;
|
||||
+ #if !GLIB_CHECK_VERSION(2,31,0)
|
||||
g_thread_init (NULL);
|
||||
+ #endif
|
||||
g_type_init ();
|
||||
|
||||
provider = g_new0 (EmailProvider, 1);
|
||||
diff --git a/shell/main.c b/shell/main.c
|
||||
index bb056e3..5b76a2e 100644
|
||||
--- a/shell/main.c
|
||||
+++ b/shell/main.c
|
||||
@@ -492,8 +492,10 @@ main (gint argc,
|
||||
textdomain (GETTEXT_PACKAGE);
|
||||
|
||||
g_type_init ();
|
||||
+ #if !GLIB_CHECK_VERSION(2,31,0)
|
||||
if (!g_thread_get_initialized ())
|
||||
g_thread_init (NULL);
|
||||
+ #endif
|
||||
|
||||
/* do not require Gtk+ for --force-shutdown */
|
||||
if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) {
|
@ -27,8 +27,8 @@
|
||||
### Abstract ###
|
||||
|
||||
Name: evolution
|
||||
Version: 3.3.1
|
||||
Release: 2%{?dist}
|
||||
Version: 3.3.2
|
||||
Release: 1%{?dist}
|
||||
Group: Applications/Productivity
|
||||
Summary: Mail and calendar client for GNOME
|
||||
License: GPLv2+ and GFDL
|
||||
@ -47,8 +47,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
|
||||
# RH bug #589555
|
||||
Patch02: evolution-2.30.1-help-contents.patch
|
||||
|
||||
Patch03: evolution-3.3.1-no-g-thread-init.patch
|
||||
|
||||
## Dependencies ###
|
||||
|
||||
Requires(pre): GConf2
|
||||
@ -205,7 +203,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
|
||||
%setup -q -n evolution-%{version}
|
||||
%patch01 -p1 -b .ldaphack
|
||||
%patch02 -p1 -b .help-contents
|
||||
%patch03 -p1 -b .no-g-thread-init
|
||||
|
||||
mkdir -p krb5-fakeprefix/include
|
||||
mkdir -p krb5-fakeprefix/lib
|
||||
@ -651,6 +648,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Nov 21 2011 Milan Crha <mcrha@redhat.com> - 3.3.2-1
|
||||
- Update to 3.3.2
|
||||
- Remove patch to not call g_thread_init() (fixed upstream)
|
||||
|
||||
* Fri Oct 28 2011 Matthew Barnes <mbarnes@redhat.com> - 3.3.1-2
|
||||
- Fix detection of evolution-help (not using OMF files anymore).
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user