mcrha pushed to evolution (f22). "Add patch for RH bug #1229230 (Broken save of filter rules)"

[notifications at fedoraproject.org]

From d614a320e30069b76f94296cf585dc5a84948ada Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha at redhat.com>
Date: Mon, 8 Jun 2015 16:52:36 +0200
Subject: Add patch for RH bug #1229230 (Broken save of filter rules)


diff --git a/evolution-3.16.3-filter-rules.patch b/evolution-3.16.3-filter-rules.patch
new file mode 100644
index 0000000..460d065
--- /dev/null
+++ b/evolution-3.16.3-filter-rules.patch
@@ -0,0 +1,20 @@
+From 21b1070c48263ecb4c0a045644f1a80a3edfe2c5 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha at 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 ba9a579..58bd30a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -29,7 +29,7 @@
 
 Name: evolution
 Version: 3.16.3
-Release: 1%{?dist}
+Release: 2%{?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 #
-#Patch01: .patch
+# RH bug #1229230
+Patch01: evolution-3.16.3-filter-rules.patch
 
 ## Dependencies ###
 
@@ -70,8 +70,7 @@ BuildRequires: yelp-tools
 
 BuildRequires: pkgconfig(atk)
 BuildRequires: pkgconfig(cairo-gobject)
-#BuildRequires: pkgconfig(camel-1.2) >= %{version}
-BuildRequires: pkgconfig(camel-1.2) >= 3.16.2
+BuildRequires: pkgconfig(camel-1.2) >= %{version}
 BuildRequires: pkgconfig(cryptui-0.0)
 BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version}
 BuildRequires: pkgconfig(gcr-3)
@@ -84,14 +83,10 @@ BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
 BuildRequires: pkgconfig(gtkspell3-3.0)
 BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version}
 BuildRequires: pkgconfig(libcanberra-gtk3)
-#BuildRequires: pkgconfig(libebackend-1.2) >= %{version}
-#BuildRequires: pkgconfig(libebook-1.2) >= %{version}
-#BuildRequires: pkgconfig(libecal-1.2) >= %{version}
-#BuildRequires: pkgconfig(libedataserver-1.2) >= %{version}
-BuildRequires: pkgconfig(libebackend-1.2) >= 3.16.2
-BuildRequires: pkgconfig(libebook-1.2) >= 3.16.2
-BuildRequires: pkgconfig(libecal-1.2) >= 3.16.2
-BuildRequires: pkgconfig(libedataserver-1.2) >= 3.16.2
+BuildRequires: pkgconfig(libebackend-1.2) >= %{version}
+BuildRequires: pkgconfig(libebook-1.2) >= %{version}
+BuildRequires: pkgconfig(libecal-1.2) >= %{version}
+BuildRequires: pkgconfig(libedataserver-1.2) >= %{version}
 BuildRequires: pkgconfig(libgdata) >= %{libgdata_version}
 BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
 BuildRequires: pkgconfig(libxml-2.0)
@@ -122,20 +117,15 @@ personal information-management tool.
 Group: Development/Libraries
 Summary: Development files for building against %{name}
 Requires: %{name} = %{version}-%{release}
-#Requires: pkgconfig(camel-1.2) >= %{version}
-Requires: pkgconfig(camel-1.2) >= 3.16.2
+Requires: pkgconfig(camel-1.2) >= %{version}
 Requires: pkgconfig(cryptui-0.0)
 Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
 Requires: pkgconfig(gtkspell3-3.0)
 Requires: pkgconfig(gweather-3.0) >= %{libgweather_version}
-#Requires: pkgconfig(libebackend-1.2) >= %{version}
-#Requires: pkgconfig(libebook-1.2) >= %{version}
-#Requires: pkgconfig(libecal-1.2) >= %{version}
-#Requires: pkgconfig(libedataserver-1.2) >= %{version}
-Requires: pkgconfig(libebackend-1.2) >= 3.16.2
-Requires: pkgconfig(libebook-1.2) >= 3.16.2
-Requires: pkgconfig(libecal-1.2) >= 3.16.2
-Requires: pkgconfig(libedataserver-1.2) >= 3.16.2
+Requires: pkgconfig(libebackend-1.2) >= %{version}
+Requires: pkgconfig(libebook-1.2) >= %{version}
+Requires: pkgconfig(libecal-1.2) >= %{version}
+Requires: pkgconfig(libedataserver-1.2) >= %{version}
 Requires: pkgconfig(libgdata) >= %{libgdata_version}
 Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
 Requires: pkgconfig(libxml-2.0)
@@ -216,7 +206,7 @@ the functionality of the installed %{name} package.
 
 %prep
 %setup -q -n evolution-%{version}
-#%patch01 -p1 -b .backup
+%patch01 -p1 -b .filter-rules
 
 # Remove the welcome email from Novell
 for inbox in mail/default/*/Inbox; do
@@ -547,6 +537,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Jun 08 2015 Milan Crha <mcrha at redhat.com> - 3.16.3-2
+- Add patch for RH bug #1229230 (Broken save of filter rules)
+
 * Mon Jun 08 2015 Milan Crha <mcrha at redhat.com> - 3.16.3-1
 - Update to 3.16.3
 - Disable help build when gtk-doc is disabled
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/evolution.git/commit/?h=f22&id=d614a320e30069b76f94296cf585dc5a84948ada