Hello community, here is the log from the commit of package evolution for openSUSE:Factory checked in at 2013-01-07 15:06:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution (Old) and /work/SRC/openSUSE:Factory/.evolution.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution", Maintainer is "projectnov-s...@epam.com" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution/evolution.changes 2012-11-21 15:11:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.evolution.new/evolution.changes 2013-01-07 15:06:14.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Dec 22 06:22:56 CET 2012 - h...@opensuse.org + +- Rebase and re-enable bnc-435722-book-uri-long.patch. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.Lu2djW/_old 2013-01-07 15:06:15.000000000 +0100 +++ /var/tmp/diff_new_pack.Lu2djW/_new 2013-01-07 15:06:15.000000000 +0100 @@ -33,7 +33,7 @@ # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859 Url: http://gnome.org/projects/evolution/ Source0: http://download.gnome.org/sources/evolution/3.6/%{name}-%{version}.tar.xz -# PATCH-NEEDS-REBASE bnc-435722-book-uri-long.patch bnc#435722 abhar...@suse.de -- Book URI: Spills Into Second Column. (was PATCH-FIX-UPSTREAM) +# PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abhar...@suse.de -- Book URI: Spills Into Second Column. Patch19: bnc-435722-book-uri-long.patch BuildRequires: bison BuildRequires: fdupes @@ -126,8 +126,7 @@ %prep %setup -q translation-update-upstream -# needs-rebase -#%%patch19 +%patch19 -p1 %build %if %{need_autogen} ++++++ bnc-435722-book-uri-long.patch ++++++ --- /var/tmp/diff_new_pack.Lu2djW/_old 2013-01-07 15:06:15.000000000 +0100 +++ /var/tmp/diff_new_pack.Lu2djW/_new 2013-01-07 15:06:15.000000000 +0100 @@ -1,14 +1,15 @@ -Index: addressbook/printing/e-contact-print.c -=================================================================== ---- addressbook/printing/e-contact-print.c.orig -+++ addressbook/printing/e-contact-print.c -@@ -265,8 +265,20 @@ e_contact_print_contact (EContact *conta +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", +- text = g_strdup_printf ( +- "%s: %s", - e_contact_pretty_name (field), value); -+ if (field == E_CONTACT_BOOK_URI) { ++ if (field == E_CONTACT_BOOK_UID) { + gchar **tmpv; + tmpv = g_strsplit (value, ";", 2); + /* To translators: While printing contacts display the addressbook @@ -16,7 +17,8 @@ + Example: "Address Book: Frequent Contacts" + */ + text = g_strdup_printf ("%s: %s", -+ _( "Address Book" ), tmpv[1]); ++ _( "Address Book" ), ++ (tmpv && tmpv [0] && tmpv [1]) ? tmpv[1] : value); + g_strfreev (tmpv); + } + else -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
