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

Update to 3.3.90

OBS-URL: https://build.opensuse.org/request/show/106365
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=160
This commit is contained in:
Vincent Untz 2012-02-23 12:19:07 +00:00 committed by Git OBS Bridge
parent a56a1393b1
commit 01553b00de
5 changed files with 25 additions and 62 deletions

View File

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

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

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

View File

@ -1,13 +0,0 @@
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) \

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Feb 20 22:36:56 UTC 2012 - dimstar@opensuse.org
- Update to version 3.3.90:
+ Use GSettings for EProxy
+ Updated documentations
+ Bugs fixed: bgo#670414, bgo#670301, bgo#670389, bgo#668620,
bgo#670252, bgo#552873, bgo#471795, bgo#670278, bgo#670280,
bgo#663110, bgo#663077, bgo#320976, bgo#332043, bgo#668482,
bgo#669113, bgo#668848, bgo#659396, bgo#659394, bgo#655955,
bgo#670014, bgo#655485, bgo#655021, bgo#637200, bgo#662743,
bgo#670073, bgo#591436, bgo#637354, bgo#669097, bgo#669433,
bgo#210105, bgo#384838, bgo#391472, bgo#418520, bgo#553796,
bgo#309945.
+ Updated translations.
- Drop evolution-pst-plugin.patch: fixed upstream.
- Drop the two subpackages libemail-engine0 and libemail-utils0:
Like any shared library, we do not obsolete them. Only very few
users have those libs from a short Factory lifetime.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Feb 19 17:08:11 UTC 2012 - dimstar@opensuse.org Sun Feb 19 17:08:11 UTC 2012 - dimstar@opensuse.org

View File

@ -79,15 +79,13 @@ BuildRequires: pkgconfig(shared-mime-info)
BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(sm)
# 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 3.4 %define evolution_base_version 3.4
Version: 3.3.5 Version: 3.3.90
Release: 0 Release: 0
# 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
License: LGPL-2.0 ; LGPL-3.0 License: LGPL-2.0 ; LGPL-3.0
Group: Productivity/Networking/Email/Clients Group: Productivity/Networking/Email/Clients
Source0: http://download.gnome.org/sources/evolution/3.3/%{name}-%{version}.tar.xz 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 # 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 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. # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column.
@ -123,32 +121,10 @@ Evolution or embed the existing ones in other applications.
This package provides a catalog for Glade, to allow the use of Evolution This package provides a catalog for Glade, to allow the use of Evolution
widgets in Glade. 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 %package devel
Summary: Include Files and Libraries mandatory for Development Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: evolution = %{version} Requires: evolution = %{version}
Requires: libemail-engine0 = %{version}
Requires: libemail-utils0 = %{version}
Provides: evolution2-devel = %{version} Provides: evolution2-devel = %{version}
Obsoletes: evolution2-devel < %{version} Obsoletes: evolution2-devel < %{version}
@ -199,7 +175,6 @@ Evolution or embed the existing ones in other applications.
%prep %prep
%setup -q %setup -q
translation-update-upstream translation-update-upstream
%patch0 -p1
%if %USE_EVOLDAP %if %USE_EVOLDAP
%patch15 -p1 %patch15 -p1
%endif %endif
@ -274,14 +249,6 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
%desktop_database_postun %desktop_database_postun
%icon_theme_cache_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/ldconfig
%files -f %{name}.schemas_list %files -f %{name}.schemas_list
%defattr(-,root,root) %defattr(-,root,root)
%doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 COPYING-DOCS COPYING.OPENLDAP ChangeLog MAINTAINERS NEWS NEWS-1.0 README %doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 COPYING-DOCS COPYING.OPENLDAP ChangeLog MAINTAINERS NEWS NEWS-1.0 README
@ -301,7 +268,7 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml
%dir %{_libdir}/evolution %dir %{_libdir}/evolution
%dir %{_libdir}/evolution/* %dir %{_libdir}/evolution/*
%{_libdir}/evolution/*/*.so.* %{_libdir}/evolution/*/*.so
%dir %{_libdir}/evolution/*/modules/ %dir %{_libdir}/evolution/*/modules/
%{_libdir}/evolution/*/modules/*-module-addressbook.* %{_libdir}/evolution/*/modules/*-module-addressbook.*
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
@ -375,20 +342,9 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
%{_libdir}/glade/modules/libgladeevolution.so %{_libdir}/glade/modules/libgladeevolution.so
%{_datadir}/glade/catalogs/evolution.xml %{_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 %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/* %{_includedir}/*
%{_libdir}/libemail-engine.so
%{_libdir}/libemail-utils.so
%{_libdir}/evolution/%{evolution_base_version}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%{_datadir}/gtk-doc/html/eshell %{_datadir}/gtk-doc/html/eshell