Hello community,
here is the log from the commit of package evolution-ews for openSUSE:Factory checked in at 2015-06-09 08:49:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/evolution-ews (Old)
and /work/SRC/openSUSE:Factory/.evolution-ews.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution-ews"
Changes:
--------
--- /work/SRC/openSUSE:Factory/evolution-ews/evolution-ews.changes 2015-05-18 21:24:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.evolution-ews.new/evolution-ews.changes 2015-06-09 08:50:36.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Jun 8 11:46:26 UTC 2015 - zaitor@opensuse.org
+
+- Update to version 3.16.3:
+ + Correct locking in e_book_backend_ews_set_locale().
+ + Address some of the Coverity Scan issues.
+- Add evolution-ews-intltool-path.patch: Fix locale installation
+ when using recent intltools.
+- Delete po/Makefile* to ensure no stale file is left.
+- Add gnome-common BuildRequires and call to gnome-autogen.sh, as
+ above patch touches the buildsystem.
+
+-------------------------------------------------------------------
Old:
----
evolution-ews-3.16.2.tar.xz
New:
----
evolution-ews-3.16.3.tar.xz
evolution-ews-intltool-path.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ evolution-ews.spec ++++++
--- /var/tmp/diff_new_pack.XxSwkf/_old 2015-06-09 08:50:37.000000000 +0200
+++ /var/tmp/diff_new_pack.XxSwkf/_new 2015-06-09 08:50:37.000000000 +0200
@@ -19,14 +19,18 @@
Name: evolution-ews
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
%define evolution_base_version 3.16
-Version: 3.16.2
+Version: 3.16.3
Release: 0
Summary: Exchange Connector for Evolution, compatible with Exchange 2007 and later
License: LGPL-2.1
Group: Productivity/Networking/Email/Clients
Url: http://projects.gnome.org/evolution/
Source: http://download.gnome.org/sources/evolution-ews/3.16/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM evolution-ews-intltool-path.patch bgo#750571 dimstar@opensuse.org -- Fix installation of locales when building using recent intltools
+Patch0: evolution-ews-intltool-path.patch
BuildRequires: fdupes
+# Needed for patch0
+BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: translation-update-upstream
BuildRequires: pkgconfig(enchant)
@@ -86,9 +90,14 @@
%lang_package
%prep
%setup -q
+%patch0 -p1
+# let's just intltoolize this tarball
+rm po/Makefile*
translation-update-upstream
%build
+# Needed for patch0
+NOCONFIGURE=1 gnome-autogen.sh
%{configure} \
--disable-static
make %{?_smp_mflags}
++++++ evolution-ews-3.16.2.tar.xz -> evolution-ews-3.16.3.tar.xz ++++++
++++ 2105 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-ews-3.16.2/NEWS new/evolution-ews-3.16.3/NEWS
--- old/evolution-ews-3.16.2/NEWS 2015-05-11 08:00:01.000000000 +0200
+++ new/evolution-ews-3.16.3/NEWS 2015-06-08 09:21:40.000000000 +0200
@@ -1,3 +1,10 @@
+Evolution-EWS 3.16.3 2015-06-08
+-------------------------------
+
+Miscellaneous:
+ Correct locking in e_book_backend_ews_set_locale() (Milan Crha)
+ Address some of the Coverity Scan issues (Milan Crha)
+
Evolution-EWS 3.16.2 2015-05-11
-------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-ews-3.16.2/compile new/evolution-ews-3.16.3/compile
--- old/evolution-ews-3.16.2/compile 2015-05-11 08:00:32.000000000 +0200
+++ new/evolution-ews-3.16.3/compile 2015-06-08 09:22:18.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-ews-3.16.2/configure.ac new/evolution-ews-3.16.3/configure.ac
--- old/evolution-ews-3.16.2/configure.ac 2015-04-13 09:09:53.000000000 +0200
+++ new/evolution-ews-3.16.3/configure.ac 2015-05-11 08:02:46.000000000 +0200
@@ -1,7 +1,7 @@
dnl Evolution-EWS version
m4_define([ews_major_version], [3])
m4_define([ews_minor_version], [16])
-m4_define([ews_micro_version], [2])
+m4_define([ews_micro_version], [3])
m4_define([ews_version],
[ews_major_version.ews_minor_version.ews_micro_version])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-ews-3.16.2/m4/intltool.m4 new/evolution-ews-3.16.3/m4/intltool.m4
--- old/evolution-ews-3.16.2/m4/intltool.m4 2015-05-11 08:00:21.000000000 +0200
+++ new/evolution-ews-3.16.3/m4/intltool.m4 2015-06-08 09:22:07.000000000 +0200
@@ -155,31 +155,6 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]],
- [[extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr]])],
- [DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share
- dnl in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [DATADIRNAME=share], [DATADIRNAME=lib])
- ;;
- *)
- [DATADIRNAME=lib]
- ;;
- esac])
-fi
-AC_SUBST(DATADIRNAME)
-
IT_PO_SUBDIR([po])
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-ews-3.16.2/missing new/evolution-ews-3.16.3/missing
--- old/evolution-ews-3.16.2/missing 2015-05-11 08:00:32.000000000 +0200
+++ new/evolution-ews-3.16.3/missing 2015-06-08 09:22:18.000000000 +0200
@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-ews-3.16.2/po/Makefile.in.in new/evolution-ews-3.16.3/po/Makefile.in.in
--- old/evolution-ews-3.16.2/po/Makefile.in.in 2015-05-11 08:00:21.000000000 +0200
+++ new/evolution-ews-3.16.3/po/Makefile.in.in 2015-06-08 09:22:07.000000000 +0200
@@ -33,8 +33,7 @@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
-DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+localedir = @localedir@
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@.
@@ -80,7 +79,7 @@
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
- $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
+ $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
$(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
@@ -108,7 +107,7 @@
install-data-yes: all
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
if test -r $$lang.gmo; then \
$(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
@@ -142,8 +141,8 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-ews-3.16.2/src/addressbook/e-book-backend-ews.c new/evolution-ews-3.16.3/src/addressbook/e-book-backend-ews.c
--- old/evolution-ews-3.16.2/src/addressbook/e-book-backend-ews.c 2015-04-09 16:34:29.000000000 +0200
+++ new/evolution-ews-3.16.3/src/addressbook/e-book-backend-ews.c 2015-05-22 13:47:17.000000000 +0200
@@ -2757,7 +2757,10 @@
if (!ret)
goto exit;
- e_book_sqlite_set_key_value (priv->summary, "etag", etag ? etag : "", NULL);
+ ret = e_book_sqlite_set_key_value (priv->summary, "etag", etag ? etag : "", NULL);
+ if (!ret)
+ goto exit;
+
if (e_book_sqlite_set_key_value (priv->summary, "oab-filename",
uncompressed_filename, NULL)) {
/* Don't let it get deleted */
@@ -4284,8 +4287,10 @@
PRIV_LOCK (ebews->priv);
- if (!e_book_sqlite_lock (ebews->priv->summary, EBSQL_LOCK_WRITE, cancellable, error))
+ if (!e_book_sqlite_lock (ebews->priv->summary, EBSQL_LOCK_WRITE, cancellable, error)) {
+ PRIV_UNLOCK (ebews->priv);
return FALSE;
+ }
if (e_book_sqlite_set_locale (ebews->priv->summary, locale, cancellable, error) &&
ebews_bump_revision (ebews, error))
@@ -4307,7 +4312,7 @@
cursor, NULL, cancellable, error);
}
- PRIV_LOCK (ebews->priv);
+ PRIV_UNLOCK (ebews->priv);
return success;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-ews-3.16.2/src/addressbook/ews-oab-decoder.c new/evolution-ews-3.16.3/src/addressbook/ews-oab-decoder.c
--- old/evolution-ews-3.16.2/src/addressbook/ews-oab-decoder.c 2014-09-17 20:19:02.000000000 +0200
+++ new/evolution-ews-3.16.3/src/addressbook/ews-oab-decoder.c 2015-05-22 13:47:17.000000000 +0200
@@ -956,7 +956,7 @@
if (!contact)
return ret;
- if (dset->addr) {
+ if (dset && dset->addr) {
e_contact_set (contact, E_CONTACT_ADDRESS_WORK, dset->addr);
e_contact_address_free (dset->addr);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-ews-3.16.2/src/server/e-ews-folder.c new/evolution-ews-3.16.3/src/server/e-ews-folder.c
--- old/evolution-ews-3.16.2/src/server/e-ews-folder.c 2014-11-19 19:06:36.000000000 +0100
+++ new/evolution-ews-3.16.3/src/server/e-ews-folder.c 2015-05-22 13:47:17.000000000 +0200
@@ -521,7 +521,7 @@
if (!count)
return g_strdup (folder_name);
- res = g_malloc0 (sizeof (gchar *) * (1 + ii + (2 * count)));
+ res = g_malloc0 (sizeof (gchar) * (1 + ii + (2 * count)));
for (ii = 0, jj = 0; folder_name[ii]; ii++, jj++) {
if (folder_name[ii] == '\\') {
res[jj] = '\\';
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/evolution-ews-3.16.2/src/server/e-ews-notification.c new/evolution-ews-3.16.3/src/server/e-ews-notification.c
--- old/evolution-ews-3.16.2/src/server/e-ews-notification.c 2015-04-21 21:08:40.000000000 +0200
+++ new/evolution-ews-3.16.3/src/server/e-ews-notification.c 2015-05-22 13:47:17.000000000 +0200
@@ -148,7 +148,7 @@
e_ews_notification_get_connection (const EEwsNotification *notification)
{
g_return_val_if_fail (E_IS_EWS_NOTIFICATION (notification), NULL);
- g_return_val_if_fail (notification->priv == NULL, NULL);
+ g_return_val_if_fail (notification->priv != NULL, NULL);
return notification->priv->connection;
}
++++++ evolution-ews-intltool-path.patch ++++++
Index: evolution-ews-3.16.3/configure.ac
===================================================================
--- evolution-ews-3.16.3.orig/configure.ac
+++ evolution-ews-3.16.3/configure.ac
@@ -199,9 +199,6 @@ GETTEXT_PACKAGE=evolution-ews
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
-localedir='$(prefix)/$(DATADIRNAME)/locale'
-AC_SUBST(localedir)
-
dnl ****************************
dnl Initialize libtool
dnl ****************************