From cc0b03e42d5bc17a9c89e34533fa978e304fe978820644831c5b4eea27b7b5bd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Jun 2015 14:50:23 +0000 Subject: [PATCH] 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}