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

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

Browse Source 
Update to 3.3.5

OBS-URL: https://build.opensuse.org/request/show/103090
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=155
This commit is contained in:
Vincent Untz 2012-02-08 15:18:12 +00:00 committed by Git OBS Bridge
parent cb8afbeec9
commit 4e6c37edee
5 changed files with 87 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
evolution-3.3.4.tar.xz
View File

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

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

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

13
evolution-pst-plugin.patch Normal file
View File

@ -0,0 +1,13 @@
Index: evolution-3.3.5/plugins/pst-import/Makefile.am
===================================================================
--- evolution-3.3.5.orig/plugins/pst-import/Makefile.am
+++ evolution-3.3.5/plugins/pst-import/Makefile.am
@@ -29,6 +29,8 @@ liborg_gnome_pst_import_la_LIBADD = \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/mail/libevolution-mail.la \
$(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/libemail-engine/libemail-engine.la \
+ $(top_builddir)/libemail-utils/libemail-utils.la \
$(EVOLUTION_DATA_SERVER_LIBS) \
$(GNOME_PLATFORM_LIBS) \
$(GTKHTML_LIBS) \

24
evolution.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
Sun Feb 5 21:17:04 UTC 2012 - dimstar@opensuse.org
- Update to version 3.3.5:
+ configure.ac: Mention libpst minimum version in error message.
+ Introduce libemail-engine and libemail-utils.
+ EMailBackend: Make sure all background jobs have descriptions.
+ Remove duplicate Windows SENS checks
+ e-mail-store-utils.c: Use the service's display name in status
messages.
+ Remove the --debug command-line option.
+ Use _DAWATI to detect if its Tizen/MeeGo.
+ Bugs fixed: bgo#636413, bgo#646430, bgo#651221, bgo#659395,
bgo#661535, bgo#664160, bgo#667576, bgo#667741, bgo#668479,
bgo#668480, bgo#668595, bgo#668631, bgo#668634, bgo#668714,
bgo#668805, bgo#669005, bgo#669006.
+ Updated translations:
- Add evolution-pst-plugin.patch: Fix linking pst import plugin.
- Add gnome-common BuildRequires and call autoreconf
unconditionally (using || 1) instead of only in case of when
evoldap2 is enabled.
- Split out libemail-utils and libemail-engine subpackages as per
SLPP.
-------------------------------------------------------------------
Mon Jan 16 17:52:14 UTC 2012 - vuntz@opensuse.org

51
evolution.spec
View File

@ -27,7 +27,7 @@ BuildRequires: evoldap2-devel
BuildRequires: openldap2-devel
%endif
BuildRequires: fdupes
%if %USE_EVOLDAP
%if %USE_EVOLDAP || 1
BuildRequires: gnome-common
%endif
BuildRequires: gnome-doc-utils-devel
@ -73,13 +73,15 @@ 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.4
Version: 3.3.5
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-pst-plugin.patch bgo#669443 dimstar@opensuse.org -- Fix linking of evolution pst import plugin.
Patch0: evolution-pst-plugin.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.
@ -115,10 +117,32 @@ Evolution or embed the existing ones in other applications.
This package provides a catalog for Glade, to allow the use of Evolution
widgets in Glade.
%package -n libemail-engine0
Summary: Client library for evolution mail
Group: System/Libraries
%description -n libemail-engine0
Evolution consists of modular components (at the moment: mailer,
calendar, and address book) that should make daily life easier. Because
of the modular design, it is possible to plug new components into
Evolution or embed the existing ones in other applications.
%package -n libemail-utils0
Summary: Client library for evolution mail
Group: System/Libraries
%description -n libemail-utils0
Evolution consists of modular components (at the moment: mailer,
calendar, and address book) that should make daily life easier. Because
of the modular design, it is possible to plug new components into
Evolution or embed the existing ones in other applications.
%package devel
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
Requires: evolution = %{version}
Requires: libemail-engine0 = %{version}
Requires: libemail-utils0 = %{version}
Provides: evolution2-devel = %{version}
Obsoletes: evolution2-devel < %{version}
@ -168,7 +192,8 @@ Evolution or embed the existing ones in other applications.
%lang_package
%prep
%setup -q
translation-update-upstream
#translation-update-upstream
%patch0 -p1
%if %USE_EVOLDAP
%patch15 -p1
%endif
@ -177,7 +202,7 @@ translation-update-upstream
#%%patch35
%build
%if %USE_EVOLDAP
%if %USE_EVOLDAP || 1
autoreconf -f -i
intltoolize --copy --force
%{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
@ -243,6 +268,14 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
%desktop_database_postun
%icon_theme_cache_postun
%post -n libemail-engine0 -p /sbin/ldconfig
%postun -n libemail-engine0 -p /sbin/ldconfig
%post -n libemail-utils0 -p /sbin/ldconfig
%postun -n libemail-utils0 -p /sbin/ldconfi
%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 COPYING-DOCS COPYING.OPENLDAP ChangeLog MAINTAINERS NEWS NEWS-1.0 README
@ -336,9 +369,19 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
%{_libdir}/glade/modules/libgladeevolution.so
%{_datadir}/glade/catalogs/evolution.xml
%files -n libemail-engine0
%defattr(-,root,root)
%{_libdir}/libemail-engine.so.*
%files -n libemail-utils0
%defattr(-,root,root)
%{_libdir}/libemail-utils.so.*
%files devel
%defattr(-,root,root)
%{_includedir}/*
%{_libdir}/libemail-engine.so
%{_libdir}/libemail-utils.so
%{_libdir}/evolution/%{evolution_base_version}/*.so
%{_libdir}/pkgconfig/*.pc
%{_datadir}/gtk-doc/html/eshell