pool/evolution
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 101166 from GNOME:Factory

Browse Source 
Pushing bits of G:F that are fine (mostly update to 3.3.4)

OBS-URL: https://build.opensuse.org/request/show/101166
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=120
This commit is contained in:
Stephan Kulow 2012-01-25 09:35:10 +00:00 committed by Git OBS Bridge
commit a87af29f8d
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
evolution-3.3.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5a866037de2d7902e86599f432180aa9ba4503871bfb36260946e2e31b42af0a
size 12574676

3
evolution-3.3.4.tar.xz Normal file
View File

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

13
evolution-libpst-0.6.54.patch
View File

@ -1,13 +0,0 @@
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 5b99053..4305827 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -2219,7 +2219,7 @@ pst_init (pst_file *pst,
DEBUG_REGISTER_CLOSE ();
#endif
- if (pst_open (pst, filename) < 0) {
+ if (pst_open (pst, filename, NULL) < 0) {
pst_error_msg ("Error opening PST file %s", filename);
return -1;
}

17
evolution.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Jan 16 17:52:14 UTC 2012 - vuntz@opensuse.org
- Update to version 3.3.4:
+ Various code changes.
+ User documentation improvements
+ Bugs fixed:
- bgo#661087: Add ability to remove localized "Re:" prefixes in
subject
- bgo#343499, bgo#353743, bgo#357175, bgo#612257, bgo#636214,
bgo#638810, bgo#641154, bgo#661885, bgo#664003, bgo#664370,
bgo#665036, bgo#666490, bgo#666675, bgo#666695, bgo#666706,
bgo#666832, bgo#667119, bgo#667185, bgo#667281, bgo#667346,
bgo#667384, bgo#667398, bgo#667528.
+ Updated translations.
- Drop evolution-libpst-0.6.54.patch: fixed upstream.
-------------------------------------------------------------------
Thu Jan 5 10:33:18 UTC 2012 - vuntz@opensuse.org

7
evolution.spec
View File

@ -64,7 +64,7 @@ BuildRequires: pkgconfig(libedataserverui-3.0)
BuildRequires: pkgconfig(libgdata)
BuildRequires: pkgconfig(libgtkhtml-4.0)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libpst)
BuildRequires: pkgconfig(libpst) >= 0.6.54
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(nspr)
@ -73,15 +73,13 @@ BuildRequires: pkgconfig(pangoft2)
BuildRequires: pkgconfig(shared-mime-info)
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
%define evolution_base_version 3.4
Version: 3.3.3
Version: 3.3.4
Release: 0
# FIXME: check with upstream/meego if we want to enable clutter for express mode
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
License: LGPL-2.0 ; LGPL-3.0
Group: Productivity/Networking/Email/Clients
Source0: http://download.gnome.org/sources/evolution/3.3/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM evolution-libpst-0.6.54.patch bgo#667346 vuntz@opensuse.org -- Fix build with libpst 0.6.54
Patch0: evolution-libpst-0.6.54.patch
# 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-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column.
@ -171,7 +169,6 @@ Evolution or embed the existing ones in other applications.
%prep
%setup -q
translation-update-upstream
%patch0 -p1
%if %USE_EVOLDAP
%patch15 -p1
%endif