From f5b75c92bdcd417b2a92c52b2a34eb3b59042af8ff208ca71313dbf33293a499 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Mon, 7 May 2018 11:11:21 +0000
Subject: [PATCH] Accepting request 605059 from home:iznogood

- Update to version 3.28.2:
  + Link WebKitGTK+ only with libedataserverui when OAuth2 is
    enabled.
  + Stale connection used after resume.
  + Bugs fixed: bgo#795108, bgo#791475, bgo#795295, bgo#795414,
    bgo#794727.
  + Updated translations.
- Drop evolution-data-server-icu61.1.patch: Fixed upstream.

OBS-URL: https://build.opensuse.org/request/show/605059
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution-data-server?expand=0&rev=324
---
 evolution-data-server-3.28.1.tar.xz |  3 ---
 evolution-data-server-3.28.2.tar.xz |  3 +++
 evolution-data-server-icu61.1.patch | 39 -----------------------------
 evolution-data-server.changes       | 12 +++++++++
 evolution-data-server.spec          |  5 +---
 5 files changed, 16 insertions(+), 46 deletions(-)
 delete mode 100644 evolution-data-server-3.28.1.tar.xz
 create mode 100644 evolution-data-server-3.28.2.tar.xz
 delete mode 100644 evolution-data-server-icu61.1.patch

diff --git a/evolution-data-server-3.28.1.tar.xz b/evolution-data-server-3.28.1.tar.xz
deleted file mode 100644
index 6611376..0000000
--- a/evolution-data-server-3.28.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b04fc1adaba0541546267a77f1bc5aa549fe85eb9933492fdf994c69fa36989
-size 4445420
diff --git a/evolution-data-server-3.28.2.tar.xz b/evolution-data-server-3.28.2.tar.xz
new file mode 100644
index 0000000..45b45af
--- /dev/null
+++ b/evolution-data-server-3.28.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:531a790182dc6b6b2d0421feb34489c7ddf5cc807e9cffbb87461d13e047f3ab
+size 4447268
diff --git a/evolution-data-server-icu61.1.patch b/evolution-data-server-icu61.1.patch
deleted file mode 100644
index 3791a9f..0000000
--- a/evolution-data-server-icu61.1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2cd08a03bc637fa6fefb6fbe13ae2c78abe6bf9f Mon Sep 17 00:00:00 2001
-From: Hussam Al-Tayeb <me@hussam.eu.org>
-Date: Mon, 16 Apr 2018 13:38:33 +0200
-Subject: Bug 795295 - Fails to compile after icu 61.1 upgrade
- (icu::UnicodeString)
-
----
- src/libedataserver/e-alphabet-index-private.cpp | 1 +
- src/libedataserver/e-transliterator-private.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/src/libedataserver/e-alphabet-index-private.cpp b/src/libedataserver/e-alphabet-index-private.cpp
-index d3e44f4..a789f44 100644
---- a/src/libedataserver/e-alphabet-index-private.cpp
-+++ b/src/libedataserver/e-alphabet-index-private.cpp
-@@ -36,6 +36,7 @@
- 
- using icu::AlphabeticIndex;
- using icu::Locale;
-+using icu::UnicodeString;
- 
- struct _EAlphabetIndex {
- 	AlphabeticIndex *priv;
-diff --git a/src/libedataserver/e-transliterator-private.cpp b/src/libedataserver/e-transliterator-private.cpp
-index bb15593..6f1d89c 100644
---- a/src/libedataserver/e-transliterator-private.cpp
-+++ b/src/libedataserver/e-transliterator-private.cpp
-@@ -35,6 +35,7 @@
- #include <unicode/translit.h>
- 
- using icu::Transliterator;
-+using icu::UnicodeString;
- 
- struct _ETransliterator {
- 	Transliterator *priv;
--- 
-cgit v0.12
-
-
diff --git a/evolution-data-server.changes b/evolution-data-server.changes
index 364bafe..125d97d 100644
--- a/evolution-data-server.changes
+++ b/evolution-data-server.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon May  7 09:25:10 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 3.28.2:
+  + Link WebKitGTK+ only with libedataserverui when OAuth2 is
+    enabled.
+  + Stale connection used after resume.
+  + Bugs fixed: bgo#795108, bgo#791475, bgo#795295, bgo#795414,
+    bgo#794727.
+  + Updated translations.
+- Drop evolution-data-server-icu61.1.patch: Fixed upstream.
+
 -------------------------------------------------------------------
 Mon Apr 16 15:15:47 UTC 2018 - dimstar@opensuse.org
 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index fd332cc..396395a 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -30,7 +30,7 @@
 %define so_edata_cal 28
 %define _evo_version 3.28
 Name:           evolution-data-server
-Version:        3.28.1
+Version:        3.28.2
 Release:        0
 Summary:        Evolution Data Server
 License:        LGPL-2.1-or-later
@@ -38,8 +38,6 @@ Group:          Development/Libraries/GNOME
 URL:            https://wiki.gnome.org/Apps/Evolution
 Source0:        http://download.gnome.org/sources/evolution-data-server/%{_evo_version}/%{name}-%{version}.tar.xz
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM evolution-data-server-icu61.1.patch bgo#795295 dimstar@opensuse.org -- Fix build with icu 61.1
-Patch0:         evolution-data-server-icu61.1.patch
 BuildRequires:  cmake
 BuildRequires:  db-devel
 BuildRequires:  fdupes
@@ -269,7 +267,6 @@ This package contains developer documentation.
 
 %prep
 %setup -q
-%patch0 -p1
 translation-update-upstream
 
 %build