OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=45

evolution-2.23.92+r36353.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c8929d20bb91b090c036883deae7f05db9442397a02ffbd97956626dd8dffd0b
-size 31402985

evolution-2.24.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a1516aa7986528a3b801a17a111051f6669f14cfd456a33437c13393d0aebf9
+size 32495220

evolution-advanced-search.patch

@@ -0,0 +1,17 @@
+diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
+index aee6eca..c3c6509 100644
+--- a/widgets/misc/e-filter-bar.c
++++ b/widgets/misc/e-filter-bar.c
+@@ -589,10 +589,11 @@ get_property (GObject *object, guint property_id, GValue *value, GParamSpec *psp
+ 
+ 	switch (property_id) {
+ 	case PROP_QUERY: {
++		int item_id = e_search_bar_get_item_id ((ESearchBar *) efb);
+ 		char *text = e_search_bar_get_text (E_SEARCH_BAR (efb));
+ 
+ 		/* empty search text means searching turned off */
+-		if (efb->current_query && text && *text) {
++		if (efb->current_query && ((text && *text) || item_id == E_FILTERBAR_ADVANCED_ID)) {
+ 			GString *out = g_string_new ("");
+ 
+ 			filter_rule_build_code (efb->current_query, out);

evolution.changes

@@ -1,13 +1,32 @@
+-------------------------------------------------------------------
+Wed Oct  1 15:10:17 CEST 2008 - sbrabec@suse.cz
+
+- Fixed broken advanced search GUI (bgo#554456).
+
 -------------------------------------------------------------------
 Thu Sep 25 16:01:12 CEST 2008 - abharath@suse.de
 
 - Added Pst-Import plugin support.
 
+-------------------------------------------------------------------
+Mon Sep 22 11:42:09 CDT 2008 - maw@suse.de
+
+- Update to version 2.24.0:
+  + Bugs fixed: bgo#504767, bgo#505016, bgo#514299, bgo#534039,
+    bgo#539536, bgo#551548, bgo#551628, bgo#551895, bgo#551915, and
+    bgo#552911
+  + Updated translations.
+
 -------------------------------------------------------------------
 Tue Sep 16 18:18:12 CDT 2008 - maw@suse.de
 
 - Updated the source tarball to svn r36353.
 
+-------------------------------------------------------------------
+Tue Sep 16 18:18:12 CDT 2008 - maw@suse.de
+
+- Update to svn r36353.
+
 -------------------------------------------------------------------
 Mon Sep  8 14:45:12 CDT 2008 - maw@suse.de
 

evolution.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package evolution (Version 2.23.92+r36353)
+# spec file for package evolution (Version 2.24.0)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -48,13 +48,10 @@ BuildRequires:  sqlite3-devel
 BuildRequires:  libpst-devel
 License:        GPL v2 or later
 Group:          Productivity/Networking/Email/Clients
-Obsoletes:      evoltn
-Provides:       evoltn
-AutoReqProv:    on
 #This should be updated upon major version changes; it should match
 # BASE_VERSION as defined in configure.in.
 %define evolution_base_version 2.24
-Version:        2.23.92+r36353
+Version:        2.24.0
 Release:        1
 Summary:        The Integrated GNOME Mail, Calendar, and Address Book Suite
 Source0:        %{name}-%{version}.tar.bz2
@@ -80,9 +77,9 @@ Patch8:         fix-exchange-menuitem.diff
 Patch9:         fix-sendrecv.diff
 # PATCH-FIX-UPSTREAM build-fixes.diff - Fixed for 2.21.91
 Patch10:        build-fixes.diff
-# PATCH-FIX-UPSTREAM SVN po update
-Patch12:        evolution-po-update.patch
 Patch13:        pst-import.patch
+# PATCH-FIX-UPSTREAM evolution-advanced-search.patch bgo554456 sbrabec@suse.cz -- Fix broken advanced search GUI.
+Patch14:        evolution-advanced-search.patch
 Url:            http://gnome.org/projects/evolution/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       yelp
@@ -302,7 +299,7 @@ Authors:
 
 %lang_package
 %prep
-%setup -q -n %{name}-2.23.92
+%setup -q
 # %patch1 -p0
 %if %suse_version > 1000
 # FIXME: somebody with time should fix this patch up and make it apply once more
@@ -315,8 +312,8 @@ Authors:
 %patch8
 %patch9
 #%patch10
-#%patch12
 %patch13
+%patch14 -p1
 
 %build
 autoreconf -f -i
@@ -428,10 +425,19 @@ fi
 %{_libdir}/evolution/*/conduits/*.so
 
 %changelog
+* Wed Oct 01 2008 sbrabec@suse.cz
+- Fixed broken advanced search GUI (bgo#554456).
 * Thu Sep 25 2008 abharath@suse.de
 - Added Pst-Import plugin support.
+* Mon Sep 22 2008 maw@suse.de
+- Update to version 2.24.0:
+  + Bugs fixed: bgo#504767, bgo#505016, bgo#514299, bgo#534039,
+  bgo#539536, bgo#551548, bgo#551628, bgo#551895, bgo#551915, and
+  bgo#552911
+  + Updated translations.
 * Wed Sep 17 2008 maw@suse.de
 - Updated the source tarball to svn r36353.
+- Update to svn r36353.
 * Mon Sep 08 2008 maw@suse.de
 - Update to version 2.23.92:
   + Bug fixed: bgo#549968