From 620d936e42073fe97f57b46bef2f1f99a4e53c9a37c704ef42786dd18763e2da Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Jun 2015 11:55:53 +0000 Subject: [PATCH 1/3] Accepting request 311146 from home:Zaitor:branches:GNOME:Factory New stable release - Note, not buildtested, so please let OBS build it first. OBS-URL: https://build.opensuse.org/request/show/311146 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-ews?expand=0&rev=94 --- evolution-ews-3.16.2.tar.xz | 3 --- evolution-ews-3.16.3.tar.xz | 3 +++ evolution-ews.changes | 7 +++++++ evolution-ews.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 evolution-ews-3.16.2.tar.xz create mode 100644 evolution-ews-3.16.3.tar.xz diff --git a/evolution-ews-3.16.2.tar.xz b/evolution-ews-3.16.2.tar.xz deleted file mode 100644 index 1f61c0b..0000000 --- a/evolution-ews-3.16.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:255a29ef7569e4a4d5b4faa6ca2825860e5ffc2ed2e8479def639ec51558c2d3 -size 684088 diff --git a/evolution-ews-3.16.3.tar.xz b/evolution-ews-3.16.3.tar.xz new file mode 100644 index 0000000..901d75c --- /dev/null +++ b/evolution-ews-3.16.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:529d3aa62a6d6d129871d005d95f27b433ad7aeb99f48f395347e18fb0586ad0 +size 683876 diff --git a/evolution-ews.changes b/evolution-ews.changes index 5cfcbf7..bb4683d 100644 --- a/evolution-ews.changes +++ b/evolution-ews.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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. + ------------------------------------------------------------------- Mon May 11 14:26:58 UTC 2015 - zaitor@opensuse.org diff --git a/evolution-ews.spec b/evolution-ews.spec index f233fb5..d25e07e 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -19,7 +19,7 @@ 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 From cc0b03e42d5bc17a9c89e34533fa978e304fe978820644831c5b4eea27b7b5bd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Jun 2015 14:50:23 +0000 Subject: [PATCH 2/3] fix OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-ews?expand=0&rev=95 --- evolution-ews-intltool-path.patch | 14 ++++++++++++++ evolution-ews.changes | 5 +++++ evolution-ews.spec | 9 +++++++++ 3 files changed, 28 insertions(+) create mode 100644 evolution-ews-intltool-path.patch diff --git a/evolution-ews-intltool-path.patch b/evolution-ews-intltool-path.patch new file mode 100644 index 0000000..d58acbf --- /dev/null +++ b/evolution-ews-intltool-path.patch @@ -0,0 +1,14 @@ +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 **************************** diff --git a/evolution-ews.changes b/evolution-ews.changes index bb4683d..1b3867c 100644 --- a/evolution-ews.changes +++ b/evolution-ews.changes @@ -4,6 +4,11 @@ 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. ------------------------------------------------------------------- Mon May 11 14:26:58 UTC 2015 - zaitor@opensuse.org diff --git a/evolution-ews.spec b/evolution-ews.spec index d25e07e..3964487 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -26,7 +26,11 @@ 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 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 @@ later). %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} From bb259a94e8c761ada894974f64507d23eaad54f267971fc827631f8519bff42d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Jun 2015 14:59:22 +0000 Subject: [PATCH 3/3] fix OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-ews?expand=0&rev=96 --- evolution-ews.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution-ews.spec b/evolution-ews.spec index 3964487..88d03e1 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -26,7 +26,7 @@ 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 dimstar@opensuse.org -- Fix installation of locales when building using recent intltools +# 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