SHA256
1
0
forked from pool/evolution

Accepting request 103362 from home:vuntz:branches:GNOME:Factory

Fix several issues from update to 3.3.5

OBS-URL: https://build.opensuse.org/request/show/103362
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=156
This commit is contained in:
Vincent Untz 2012-02-08 15:27:26 +00:00 committed by Git OBS Bridge
parent 4e6c37edee
commit 80c31b9bc1
2 changed files with 13 additions and 14 deletions

View File

@ -2,23 +2,18 @@
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.
+ Various other code changes.
+ 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.
- Add evolution-pst-plugin.patch: fix linking pst import plugin.
- Add need_autogen macro, that is used in addition to %USE_EVOLDAP
to determine if gnome-common BuildRequires and call to autoreconf
are used. Set it to 1 for evolution-pst-plugin.patch.
- Split out libemail-utils and libemail-engine subpackages as per
SLPP.

View File

@ -15,10 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define USE_EVOLDAP 0
# wait for port of gtkimageview to gtk3
%define use_gtkimageview 0
# Set to 1 for patch0
%define need_autogen 1
Name: evolution
BuildRequires: bison
%if %USE_EVOLDAP
@ -27,7 +31,7 @@ BuildRequires: evoldap2-devel
BuildRequires: openldap2-devel
%endif
BuildRequires: fdupes
%if %USE_EVOLDAP || 1
%if %USE_EVOLDAP || %{need_autogen}
BuildRequires: gnome-common
%endif
BuildRequires: gnome-doc-utils-devel
@ -192,7 +196,7 @@ 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
@ -202,7 +206,7 @@ Evolution or embed the existing ones in other applications.
#%%patch35
%build
%if %USE_EVOLDAP || 1
%if %USE_EVOLDAP || %{need_autogen}
autoreconf -f -i
intltoolize --copy --force
%{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
@ -274,7 +278,7 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
%post -n libemail-utils0 -p /sbin/ldconfig
%postun -n libemail-utils0 -p /sbin/ldconfi
%postun -n libemail-utils0 -p /sbin/ldconfig
%files -f %{name}.schemas_list
%defattr(-,root,root)