From 93fcd52a738ec95314d89292c9db3f672bb4edec Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 13 Jul 2015 08:56:35 +0200
Subject: [PATCH] Update to 3.16.4

---
 .gitignore                          |  1 +
 evolution-3.16.3-filter-rules.patch | 20 --------------------
 evolution.spec                      | 17 ++++++++++-------
 sources                             |  2 +-
 4 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 evolution-3.16.3-filter-rules.patch

diff --git a/.gitignore b/.gitignore
index f3baec3..8bb2278 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.16.1.tar.xz
 /evolution-3.16.2.1.tar.xz
 /evolution-3.16.3.tar.xz
+/evolution-3.16.4.tar.xz
diff --git a/evolution-3.16.3-filter-rules.patch b/evolution-3.16.3-filter-rules.patch
deleted file mode 100644
index 460d065..0000000
--- a/evolution-3.16.3-filter-rules.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 21b1070c48263ecb4c0a045644f1a80a3edfe2c5 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 8 Jun 2015 14:25:16 +0200
-Subject: Bug 750560 - EFilterInput is storing multiple values instead of one
-
-
-diff --git a/e-util/e-filter-input.c b/e-util/e-filter-input.c
-index 3772ce1..dac0d5b 100644
---- a/e-util/e-filter-input.c
-+++ b/e-util/e-filter-input.c
-@@ -300,6 +300,9 @@ filter_input_clone (EFilterElement *element)
- 	clone_input->allow_empty = input->allow_empty;
- 	clone_input->code_gen_func = g_strdup (input->code_gen_func);
- 
-+	g_list_free_full (clone_input->values, g_free);
-+	clone_input->values = NULL;
-+
- 	for (link = input->values; link != NULL; link = g_list_next (link)) {
- 		clone_input->values = g_list_prepend (clone_input->values, g_strdup (link->data));
- 	}
diff --git a/evolution.spec b/evolution.spec
index 58bd30a..608406f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -28,8 +28,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.16.3
-Release: 2%{?dist}
+Version: 3.16.4
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -43,8 +43,8 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
 
 ### Patches ###
 
-# RH bug #1229230
-Patch01: evolution-3.16.3-filter-rules.patch
+# RH bug #
+# Patch01: .patch
 
 ## Dependencies ###
 
@@ -206,7 +206,7 @@ the functionality of the installed %{name} package.
 
 %prep
 %setup -q -n evolution-%{version}
-%patch01 -p1 -b .filter-rules
+#%patch01 -p1 -b .filter-rules
 
 # Remove the welcome email from Novell
 for inbox in mail/default/*/Inbox; do
@@ -234,8 +234,7 @@ fi
 %define gtkdoc_flags --disable-gtk-doc --without-help
 %endif
 
-CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
-CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS
 
 # Regenerate configure to pick up configure.ac changes
 aclocal -I m4
@@ -537,6 +536,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Jul 13 2015 Milan Crha <mcrha@redhat.com> - 3.16.4-1
+- Update to 3.16.4
+- Remove patch for RH bug #1229230 (Fixed upstream)
+
 * Mon Jun 08 2015 Milan Crha <mcrha@redhat.com> - 3.16.3-2
 - Add patch for RH bug #1229230 (Broken save of filter rules)
 
diff --git a/sources b/sources
index 412b97f..aafb5d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e57ba305abce7463aea133e95613ee0  evolution-3.16.3.tar.xz
+5c1fe296b7c66cba711891d28a14a441  evolution-3.16.4.tar.xz