From 9cf6f70dc354ac9c2a2f039bf712b53377cf534a558f7719e958704b38c80ff0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 13 Jul 2015 13:24:23 +0000 Subject: [PATCH] Accepting request 316430 from home:Zaitor:branches:GNOME:Factory We probably need this diff OBS-URL: https://build.opensuse.org/request/show/316430 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-ews?expand=0&rev=98 --- evolution-ews-intltool-path.patch | 14 -------------- evolution-ews.changes | 4 ++++ evolution-ews.spec | 8 -------- 3 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 evolution-ews-intltool-path.patch diff --git a/evolution-ews-intltool-path.patch b/evolution-ews-intltool-path.patch deleted file mode 100644 index d58acbf..0000000 --- a/evolution-ews-intltool-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 0a31da7..5769145 100644 --- a/evolution-ews.changes +++ b/evolution-ews.changes @@ -11,6 +11,10 @@ Mon Jul 13 12:10:54 UTC 2015 - zaitor@opensuse.org + ews_dump_raw_soup_message: Check for non-NULL hdrs and body arguments. + Bugs fixed: bgo#471791, bgo#751001, bgo#751547, bgo#751725. +- Drop evolution-ews-intltool-path.patch: Fixed upstream. Also drop + gnome-common BuildRequires and call to gnome-autogen.sh, as we do + not have any patches anymore. No longer delete po/Makefile* + either. ------------------------------------------------------------------- Mon Jun 8 11:46:26 UTC 2015 - zaitor@opensuse.org diff --git a/evolution-ews.spec b/evolution-ews.spec index 1f49211..dcbf3f1 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -26,11 +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 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) @@ -91,13 +87,9 @@ later). %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}