Accepting request 228600 from GNOME:Next

Push GNOME:Next - GNOME 3.12.0

OBS-URL: https://build.opensuse.org/request/show/228600
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=232
This commit is contained in:
Dominique Leuenberger 2014-04-03 20:36:11 +00:00 committed by Git OBS Bridge
parent c7a493068a
commit fc8d457771
5 changed files with 178 additions and 51 deletions

View File

@ -1,29 +0,0 @@
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 290863c..e8e8e1a 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -326,9 +326,21 @@ e_contact_print_contact (EContact *contact,
if (value == NULL || *value == '\0')
continue;
- text = g_strdup_printf (
- "%s: %s",
- e_contact_pretty_name (field), value);
+ if (field == E_CONTACT_BOOK_UID) {
+ gchar **tmpv;
+ tmpv = g_strsplit (value, ";", 2);
+ /* To translators: While printing contacts display the addressbook
+ to which the contact belongs.
+ Example: "Address Book: Frequent Contacts"
+ */
+ text = g_strdup_printf ("%s: %s",
+ _( "Address Book" ),
+ (tmpv && tmpv [0] && tmpv [1]) ? tmpv[1] : value);
+ g_strfreev (tmpv);
+ }
+ else
+ text = g_strdup_printf ("%s: %s",
+ e_contact_pretty_name (field), value);
if (ctxt->pages == ctxt->page_nr)
e_contact_output (

View File

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

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

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

View File

@ -1,3 +1,162 @@
-------------------------------------------------------------------
Sun Mar 23 08:47:29 UTC 2014 - zaitor@opensuse.org
- Update to version 3.12.0:
+ Forbid header bars in stock GTK+ dialogs.
+ Updated translations.
-------------------------------------------------------------------
Fri Mar 14 03:11:59 UTC 2014 - dimstar@opensuse.org
- Update to version 3.11.92:
+ Don't close base stream when destroying a
CamelFilterOutputStream.
+ EWebView/EMailDisplay: Setup custom CSS styles to DOM right
after document loads.
+ Contact photos not always shown in a contact preview.
+ Missing attachment button for attachments of a known type.
+ Bugs fixed: bgo#446659, bgo#550697, bgo#710337, bgo#711350,
bgo#711351, bgo#711658, bgo#722938, bgo#723204, bgo#725402,
bgo#725615, bgo#726225.
+ Updated translations.
-------------------------------------------------------------------
Fri Mar 14 03:11:58 UTC 2014 - dimstar@opensuse.org
- Update to version 3.11.91:
+ Add shortcuts and action captions previously defined by
gtk-stock.
+ Make calendar tooltip count also days, not only
hours/minutes/seconds.
+ EMFolderTreeModel: Fix a circular dependency between model and
its data.
+ ETree/ETable: Allow easier adding of columns for sorting.
+ EWebView: Limit zoom-in/zoom-out to 0.1 .. 5.0 values.
+ EMailFormatter: Use GOutputStream instead of CamelStream.
+ Bugs fixed: bgo#542723, bgo#553927, bgo#597552, bgo#709162,
bgo#711443, bgo#711758, bgo#724437, bgo#724854, bgo#724909,
bgo#725010.
+ Updated translations.
-------------------------------------------------------------------
Fri Mar 14 03:11:57 UTC 2014 - zaitor@opensuse.org
- Update to version 3.11.90:
+ Fix typos in a logic of a "mail:ask-quick-offline" user prompt.
+ e_table_sort_info_duplicate: Missing ref of a 'column_spec'
member.
+ Fix a runtime warning on startup.
+ EMailConfigAssistant: Hack the "Go Back" button after
autoconfig.
+ Stop using deprecated gtk-stock items.
+ Bugs fixed: bgo#655806, bgo#685381, bgo#720542, bgo#720940,
bgo#721639, bgo#722041, bgo#724023.
+ Updated tranlations.
-------------------------------------------------------------------
Fri Mar 14 03:11:06 UTC 2014 - dimstar@opensuse.org
- Update to version 3.11.5:
+ Drop KRB5 dependency.
+ Drop libsoup-gnome dependency.
+ User documentation improvements.
+ EDateEdit: Force 24 hour format for locales without am/pm
equivalents.
+ Prevent GSettings from freaking out over a missing junk filter.
+ MailFolderCache: Remove 'ping' operation.
+ ESourceSelector: Fix a memory leak on a mouse button press
event.
+ Forward/Reply styles in Preferences opened empty.
+ Avoid multiple save of folder changes on application quit.
+ Memory leaks of GSettings objects.
+ Add <programming-language> entry to DOAP file.
+ EHttpRequest: Avoid possible data stream memory leak.
+ Bugs fixed: bgo#583773, bgo#645476, bgo#702709, bgo#702958,
bgo#707121, bgo#707518, bgo#721213, bgo#721427, bgo#721577,
bgo#721577, bgo#722346, bgo#722352, bgo#722415, bgo#722698,
bgo#722951, bgo#723377.
+ Updated translations.
- Drop krb5-devel BuildRequires and no longer pass --with-krb5= to
configure: the support has been removed as in fact, evolution
doesn't rely on it by itself.
-------------------------------------------------------------------
Fri Mar 14 03:11:05 UTC 2014 - zaitor@opensuse.org
- Drop bnc-435722-book-uri-long.patch, as evolution-groupwise is
going nowhere upstream, and the patch now fails to apply.
-------------------------------------------------------------------
Fri Mar 14 03:11:04 UTC 2014 - dimstar@opensuse.org
- Update to version 3.11.4:
+ configure.ac: Update PACKAGE_URL to Evolution wiki.
+ Update copyright year in About dialog.
+ Bugs fixed: bgo#333184, bgo#677300, bgo#721545.
+ Updated translations.
- Update URL to be in line with configure.ac.
-------------------------------------------------------------------
Fri Mar 14 03:11:03 UTC 2014 - dimstar@opensuse.org
- Update to version 3.11.3:
+ Nicer playback controls for audio attachments.
+ Folder tree shows connection icons next to accounts.
+ Remove --enable-strict configure option.
+ User documentation improvements.
+ Purge remaining EProxy usage.
+ itip-formatter: Search for an event in enabled calendars only.
+ Remove "side-bar-ellipsize-mode" setting.
+ Weather calendar: Be able to change temperature unit.
+ Use SoupSession's request API instead of SoupRequester.
+ Extend test-source-selector test program.
+ pine-importer: Fix a crash when importing with no existing
address books.
+ icalendar-importer: Fix a crash when importing with no existing
cals.
+ EMFolderTreeModel: Fix subscribing to a folder with children.
+ Bugs fixed: bgo#329616, bgo#704832, bgo#711499, bgo#711669,
bgo#711685, bgo#711824, bgo#712342, bgo#712388, bgo#712668,
bgo#712738, bgo#715057, bgo#715067.
+ Updated translations.
- Add pkgconfig(gtkspell3-3.0) BuildRequires: new dependency.
- Drop pkgconfig(gstreamer-1.0): no longer required.
-------------------------------------------------------------------
Fri Mar 14 03:11:02 UTC 2014 - dimstar@opensuse.org
- Update to version 3.11.2:
+ Network proxy support is far more configurable. Alternate proxy
settings can be defined in Network Preferences and applied to
individual accounts.
+ Other Changes:
- Bump webkitgtk-3.0 requirement to 2.0.1.
- Fix error handling glitch in mail_session_send_to_thread().
- Update error handling when sending offline.
- Fix potential issues found by static analysis tools.
- Make e_attachment_set_file_info() thread-safe.
- Alarm-Notify: Skip disabled sources/calendars.
- Generate documentation for libemail-engine.
+ Bugs fixed: bgo#657808, bgo#689055, bgo#707112, bgo#709428,
bgo#710489, bgo#710797, bgo#710835, bgo#710852, bgo#711198,
bgo#711477, bgo#711532, bgo#711835.
+ Updated translations.
-------------------------------------------------------------------
Fri Mar 14 03:11:01 UTC 2014 - dimstar@opensuse.org
- Update to version 3.11.1:
+ Use GcrCertificateWidget to display certificate details.
+ Bugs fixed: bgo#215115, bgo#640382, bgo#659890, bgo#705685,
bgo#707425, bgo#707720, bgo#709108, bgo#709396, bgo#710171.
+ Updated translations.
- Add pkgconfig(gcr-3) BuildRequires: new dependency for the
Certificate Widget.
- Bump evolution_base_version to 3.12.
- Add pkgconfig(geocode-glib-1.0) and pkgconfig(geoclue)
BuildRequires: Additional features.
- Disable evolution-migrate-kmail-kcontact.patch: Needs rebase.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Mar 12 19:36:40 UTC 2014 - zaitor@opensuse.org Wed Mar 12 19:36:40 UTC 2014 - zaitor@opensuse.org

View File

@ -23,10 +23,10 @@
Name: evolution Name: evolution
# 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.10 %define evolution_base_version 3.12
Version: 3.10.4 Version: 3.12.0
Release: 0 Release: 0
# _version needs to be %{version} stirpped to major.minor.micro only... # _version needs to be %{version} stripped to major.minor.micro only...
%define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+') %define _version %(echo %{version} | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+')
# FIXME: enable text-highligh once we have a package for it. # FIXME: enable text-highligh once we have a package for it.
# FIXME: check if note on license is still valid (comment before license) # FIXME: check if note on license is still valid (comment before license)
@ -34,12 +34,10 @@ Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
License: LGPL-2.0 and LGPL-3.0 License: LGPL-2.0 and LGPL-3.0
Group: Productivity/Networking/Email/Clients Group: Productivity/Networking/Email/Clients
# NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859 # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859
Url: http://gnome.org/projects/evolution/ Url: http://wiki.gnome.org/Apps/Evolution/
Source0: http://download.gnome.org/sources/evolution/3.10/%{name}-%{version}.tar.xz Source0: http://download.gnome.org/sources/evolution/3.12/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. # PATCH-NEEDS-REBASE evolution-migrate-kmail-kcontact.patch fate#316619 dliang@suse.com -- Migrate Kmail/Kcontact into evolution (WAS:PATCH-FEATURE-OPENSUSE)
Patch0: bnc-435722-book-uri-long.patch Patch0: evolution-migrate-kmail-kcontact.patch
# PATCH-FEATURE-OPENSUSE evolution-migrate-kmail-kcontact.patch fate#316619 dliang@suse.com -- Migrate Kmail/Kcontact into evolution
Patch1: evolution-migrate-kmail-kcontact.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: bogofilter BuildRequires: bogofilter
BuildRequires: fdupes BuildRequires: fdupes
@ -49,7 +47,6 @@ BuildRequires: gnome-common
%endif %endif
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: intltool BuildRequires: intltool
BuildRequires: krb5-devel
# don't you ever enable this! It's experimental and insecure (bnc#609013) # don't you ever enable this! It's experimental and insecure (bnc#609013)
#BuildRequires: libytnef-devel #BuildRequires: libytnef-devel
BuildRequires: psmisc BuildRequires: psmisc
@ -60,14 +57,17 @@ BuildRequires: update-desktop-files
BuildRequires: yelp-tools BuildRequires: yelp-tools
BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(atk)
BuildRequires: pkgconfig(gail-3.0) >= 3.2.0 BuildRequires: pkgconfig(gail-3.0) >= 3.2.0
BuildRequires: pkgconfig(gcr-3) >= 3.4
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.24.0 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.24.0
BuildRequires: pkgconfig(gio-2.0) >= 2.34.0 BuildRequires: pkgconfig(geoclue) >= 0.12.0
BuildRequires: pkgconfig(geocode-glib-1.0) >= 3.10
BuildRequires: pkgconfig(gio-2.0) >= 2.36.0
BuildRequires: pkgconfig(gladeui-2.0) >= 3.10.0 BuildRequires: pkgconfig(gladeui-2.0) >= 3.10.0
BuildRequires: pkgconfig(gnome-desktop-3.0) >= 2.91.3 BuildRequires: pkgconfig(gnome-desktop-3.0) >= 2.91.3
BuildRequires: pkgconfig(gnome-icon-theme) >= 2.30.2.1 BuildRequires: pkgconfig(gnome-icon-theme) >= 2.30.2.1
BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gtk+-3.0) >= 3.8.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0 BuildRequires: pkgconfig(gtkspell3-3.0)
BuildRequires: pkgconfig(webkitgtk-3.0) >= 1.10. BuildRequires: pkgconfig(webkitgtk-3.0) >= 2.0.1
%if %{use_gtkimageview} %if %{use_gtkimageview}
BuildRequires: pkgconfig(gtkimageview-3.0) BuildRequires: pkgconfig(gtkimageview-3.0)
%endif %endif
@ -79,7 +79,7 @@ BuildRequires: pkgconfig(libgdata) >= 0.10
BuildRequires: pkgconfig(libgtkhtml-4.0) >= 4.5.2 BuildRequires: pkgconfig(libgtkhtml-4.0) >= 4.5.2
BuildRequires: pkgconfig(libnotify) >= 0.7 BuildRequires: pkgconfig(libnotify) >= 0.7
BuildRequires: pkgconfig(libpst) >= 0.6.54 BuildRequires: pkgconfig(libpst) >= 0.6.54
BuildRequires: pkgconfig(libsoup-2.4) >= 2.40.3 BuildRequires: pkgconfig(libsoup-2.4) >= 2.42
BuildRequires: pkgconfig(libxml-2.0) >= 2.7.3 BuildRequires: pkgconfig(libxml-2.0) >= 2.7.3
BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(nspr)
BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(nss)
@ -132,9 +132,8 @@ to develop applications that require these.
%prep %prep
%setup -q %setup -q
translation-update-upstream translation-update-upstream
# Needs rebase # NEEDS REBASE
#patch0 -p1 #patch0 -p1
%patch1 -p1
%build %build
%if %{need_autogen} %if %{need_autogen}
@ -143,7 +142,6 @@ NOCONFIGURE=1 gnome-autogen.sh
%{configure} \ %{configure} \
--disable-scrollkeeper \ --disable-scrollkeeper \
--with-openldap=yes \ --with-openldap=yes \
--with-krb5=%{_prefix} \
--enable-nss=yes \ --enable-nss=yes \
--enable-smime=yes \ --enable-smime=yes \
--with-glade-catalog \ --with-glade-catalog \
@ -200,7 +198,6 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
%{_libdir}/evolution/*/*.so %{_libdir}/evolution/*/*.so
%dir %{_libdir}/evolution/%{evolution_base_version}/modules %dir %{_libdir}/evolution/%{evolution_base_version}/modules
%{_libdir}/evolution/%{evolution_base_version}/modules/module-addressbook.so %{_libdir}/evolution/%{evolution_base_version}/modules/module-addressbook.so
%{_libdir}/evolution/%{evolution_base_version}/modules/module-audio-inline.so
%{_libdir}/evolution/%{evolution_base_version}/modules/module-backup-restore.so %{_libdir}/evolution/%{evolution_base_version}/modules/module-backup-restore.so
%{_libdir}/evolution/%{evolution_base_version}/modules/module-bogofilter.so %{_libdir}/evolution/%{evolution_base_version}/modules/module-bogofilter.so
%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml