From 204d4a0a07beaa1336c698cb6d5831af9debb3f7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Aug 2012 11:52:54 +0200 Subject: [PATCH 1/9] Update to 3.5.90 --- .gitignore | 1 + evolution-3.5.5-bgo678408.patch | 26 --------------- evolution-3.5.5-libxml2.patch | 57 --------------------------------- evolution.spec | 17 ++++------ sources | 2 +- 5 files changed, 8 insertions(+), 95 deletions(-) delete mode 100644 evolution-3.5.5-bgo678408.patch delete mode 100644 evolution-3.5.5-libxml2.patch diff --git a/.gitignore b/.gitignore index cdbab75..7ff5008 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.3.1.tar.xz /evolution-3.5.4.tar.xz /evolution-3.5.5.tar.xz +/evolution-3.5.90.tar.xz diff --git a/evolution-3.5.5-bgo678408.patch b/evolution-3.5.5-bgo678408.patch deleted file mode 100644 index 42fdcf5..0000000 --- a/evolution-3.5.5-bgo678408.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c -index 5a65ad7..0d9b5a3 100644 ---- a/widgets/misc/e-web-view.c -+++ b/widgets/misc/e-web-view.c -@@ -578,11 +578,20 @@ web_view_load_status_changed_cb (WebKitWebView *web_view, - gpointer user_data) - { - WebKitLoadStatus status; -+ GtkAllocation allocation, allocation_copy; - - status = webkit_web_view_get_load_status (web_view); - if (status != WEBKIT_LOAD_FINISHED) - return; - -+ /* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */ -+ gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy); -+ allocation = allocation_copy; -+ allocation.width -= 10; -+ allocation.height -= 10; -+ gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation); -+ gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy); -+ - web_view_update_document_highlights (E_WEB_VIEW (web_view)); - } - - diff --git a/evolution-3.5.5-libxml2.patch b/evolution-3.5.5-libxml2.patch deleted file mode 100644 index 51ac89b..0000000 --- a/evolution-3.5.5-libxml2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ff88d1f11176233438cace72da46a54c479495ab Mon Sep 17 00:00:00 2001 -From: Matthew Barnes -Date: Mon, 13 Aug 2012 15:41:10 +0000 -Subject: Bug 681321 - Support both old and new-buf libxml2 APIs - -libxml2 changed the API for xmlOutputBuffer incompatibly. -See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html ---- -diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c -index 55143f0..fa5c9b7 100644 ---- a/modules/cal-config-caldav/e-caldav-chooser.c -+++ b/modules/cal-config-caldav/e-caldav-chooser.c -@@ -111,6 +111,19 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED ( - E_TYPE_SOURCE_AUTHENTICATOR, - e_caldav_chooser_authenticator_init)) - -+static gconstpointer -+compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf, -+ gsize *out_len) -+{ -+#ifdef LIBXML2_NEW_BUFFER -+ *out_len = xmlOutputBufferGetSize (buf); -+ return xmlOutputBufferGetContent (buf); -+#else -+ *out_len = buf->buffer->use; -+ return buf->buffer->content; -+#endif -+} -+ - static void - context_cancel_message (GCancellable *cancellable, - Context *context) -@@ -203,6 +216,8 @@ caldav_chooser_new_propfind (SoupSession *session, - xmlNodePtr node; - xmlNsPtr ns; - xmlOutputBufferPtr output; -+ gconstpointer content; -+ gsize length; - gpointer key; - va_list va; - -@@ -268,9 +283,11 @@ caldav_chooser_new_propfind (SoupSession *session, - xmlNodeDumpOutput (output, doc, root, 0, 1, NULL); - xmlOutputBufferFlush (output); - -+ content = compat_libxml_output_buffer_get_content (output, &length); -+ - soup_message_set_request ( - message, "application/xml", SOUP_MEMORY_COPY, -- (gchar *) output->buffer->content, output->buffer->use); -+ content, length); - - xmlOutputBufferClose (output); - --- -cgit v0.9.0.2 - diff --git a/evolution.spec b/evolution.spec index 44ad2c0..1fc1285 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.5.5 -Release: 2%{?dist} +Version: 3.5.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,13 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# BGO #678408: tiny pane used for non-multipart MIME mails. Upstream -# commit ad93908, will be in Evo 3.5.90 - adamw -Patch03: evolution-3.5.5-bgo678408.patch - -# Upstream ff88d1f11: fix build with new libxml2 -Patch04: evolution-3.5.5-libxml2.patch - ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -196,8 +189,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .bgo678408 -%patch04 -p1 -b .libxml2 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -534,6 +525,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 20 2012 Milan Crha - 3.5.90-1 +- Update to 3.5.90 +- Remove patches for BGO #678408 and #681321 (fixed upstream) + * Wed Aug 15 2012 Adam Williamson - 3.5.5-2 - backport the fix for BGO #678408 and #681321 (libxml2 build) diff --git a/sources b/sources index 53994cb..c762f4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c285b52a46f89b43a32af022c1bbdc2 evolution-3.5.5.tar.xz +4edb84ffa69c1dcb702c1c93a01c0130 evolution-3.5.90.tar.xz From 81c264acd92b3bbba61f5cbaee89bf0322e98354 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Aug 2012 14:47:48 +0200 Subject: [PATCH 2/9] Fix build-break due to changes in help compilation --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1fc1285..bbcd54d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -76,6 +76,7 @@ BuildRequires: gtk-doc BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: intltool >= %{intltool_version} +BuildRequires: itstool BuildRequires: libcanberra-devel BuildRequires: libgdata-devel >= %{libgdata_version} BuildRequires: libgweather-devel >= %{libgweather_version} @@ -90,6 +91,7 @@ BuildRequires: pkgconfig BuildRequires: rarian-compat BuildRequires: unique3-devel BuildRequires: webkitgtk3-devel >= %{webkit_version} +BuildRequires: yelp-tools %if %{inline_audio_support} BuildRequires: gstreamer-devel @@ -503,7 +505,7 @@ rm -rf $RPM_BUILD_ROOT %files help -f help.lang %defattr(-, root, root) -%dir %{_datadir}/gnome/help/evolution +%dir %{_datadir}/help/*/evolution %files bogofilter %defattr(-, root, root) @@ -528,6 +530,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Aug 20 2012 Milan Crha - 3.5.90-1 - Update to 3.5.90 - Remove patches for BGO #678408 and #681321 (fixed upstream) +- Add itstool and yelp-tools into BuildRequires * Wed Aug 15 2012 Adam Williamson - 3.5.5-2 - backport the fix for BGO #678408 and #681321 (libxml2 build) From ec18dd9bdf51714258b99d7f440f2390d3d3941a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Sep 2012 08:55:24 +0200 Subject: [PATCH 3/9] Update to 3.5.91 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7ff5008..119498e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.4.tar.xz /evolution-3.5.5.tar.xz /evolution-3.5.90.tar.xz +/evolution-3.5.91.tar.xz diff --git a/evolution.spec b/evolution.spec index bbcd54d..ad3fe30 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.5.90 +Version: 3.5.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 03 2012 Milan Crha - 3.5.91-1 +- Update to 3.5.91 + * Mon Aug 20 2012 Milan Crha - 3.5.90-1 - Update to 3.5.90 - Remove patches for BGO #678408 and #681321 (fixed upstream) diff --git a/sources b/sources index c762f4f..96a2978 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4edb84ffa69c1dcb702c1c93a01c0130 evolution-3.5.90.tar.xz +c1c6b5b2a86cc729094caef6d9d0fb68 evolution-3.5.91.tar.xz From 84ff17c5d84874b9c04f5a9ac5044ac8af9ff5b1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Sep 2012 10:41:07 +0200 Subject: [PATCH 4/9] Update to 3.5.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 119498e..5bae153 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.5.tar.xz /evolution-3.5.90.tar.xz /evolution-3.5.91.tar.xz +/evolution-3.5.92.tar.xz diff --git a/evolution.spec b/evolution.spec index ad3fe30..04c593c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.5.91 +Version: 3.5.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 17 2012 Milan Crha - 3.5.92-1 +- Update to 3.5.92 + * Mon Sep 03 2012 Milan Crha - 3.5.91-1 - Update to 3.5.91 diff --git a/sources b/sources index 96a2978..0da0787 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1c6b5b2a86cc729094caef6d9d0fb68 evolution-3.5.91.tar.xz +d598d3d2c80f3db4c5c7f06f9f96148a evolution-3.5.92.tar.xz From f5d514c4b7c15e987d95d369111fcced4beab204 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 19 Sep 2012 16:11:44 +0200 Subject: [PATCH 5/9] Fix evolution-NetworkManager obsoletes Make sure to include all 3.4.x versions in the obsolete line. --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 04c593c..d6d73f1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -15,7 +15,7 @@ %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 -%define last_evo_nm_version 3.4.3 +%define last_evo_nm_version 3.5.0 %define inline_audio_support 1 %define ldap_support 1 @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.92 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -39,7 +39,7 @@ Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} -Obsoletes: evolution-NetworkManager <= %{last_evo_nm_version} +Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Sep 19 2012 Kalev Lember - 3.5.92-2 +- Fix evolution-NetworkManager obsoletes + * Mon Sep 17 2012 Milan Crha - 3.5.92-1 - Update to 3.5.92 From bb4fe1d492d93ce76b517c7bb6b27709c5b877fa Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 22 Sep 2012 08:34:40 -0700 Subject: [PATCH 6/9] backport fix for BGO #678408 (broken message display) --- evolution-3.5.92-flatten.patch | 40 ++++++++++++++++++++++++++++++++++ evolution.spec | 9 +++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 evolution-3.5.92-flatten.patch diff --git a/evolution-3.5.92-flatten.patch b/evolution-3.5.92-flatten.patch new file mode 100644 index 0000000..509b394 --- /dev/null +++ b/evolution-3.5.92-flatten.patch @@ -0,0 +1,40 @@ +diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c +index b1d726d..520d0b1 100644 +--- a/widgets/misc/e-web-view.c ++++ b/widgets/misc/e-web-view.c +@@ -578,26 +578,23 @@ web_view_navigation_policy_decision_requested_cb (EWebView *web_view, + } + + static void +-web_view_load_status_changed_cb (WebKitWebView *web_view, ++web_view_load_status_changed_cb (WebKitWebView *webkit_web_view, + GParamSpec *pspec, + gpointer user_data) + { + WebKitLoadStatus status; +- GtkAllocation allocation, allocation_copy; ++ EWebView *web_view; + +- status = webkit_web_view_get_load_status (web_view); ++ status = webkit_web_view_get_load_status (webkit_web_view); + if (status != WEBKIT_LOAD_FINISHED) + return; + ++ web_view = E_WEB_VIEW (webkit_web_view); ++ web_view_update_document_highlights (web_view); ++ + /* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */ +- gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy); +- allocation = allocation_copy; +- allocation.width -= 10; +- allocation.height -= 10; +- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation); +- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy); +- +- web_view_update_document_highlights (E_WEB_VIEW (web_view)); ++ e_web_view_zoom_in (web_view); ++ e_web_view_zoom_out (web_view); + } + + static void + diff --git a/evolution.spec b/evolution.spec index d6d73f1..9bf319a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.92 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,6 +49,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +# BGO #678408 +Patch03: evolution-3.5.92-flatten.patch + ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -191,6 +194,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .flatten mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -527,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Sep 22 2012 Adam Williamson - 3.5.92-3 +- backport fix for BGO #678408 (broken message display) + * Wed Sep 19 2012 Kalev Lember - 3.5.92-2 - Fix evolution-NetworkManager obsoletes From 6930262c10ad15ef62a4457da1b7c6df13badd4d Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 24 Sep 2012 13:53:18 +0200 Subject: [PATCH 7/9] Use GStreamer 1.0 instead of 0.10 --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9bf319a..2efa6ce 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.92 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -97,7 +97,7 @@ BuildRequires: webkitgtk3-devel >= %{webkit_version} BuildRequires: yelp-tools %if %{inline_audio_support} -BuildRequires: gstreamer-devel +BuildRequires: gstreamer1-devel %endif %if %{ldap_support} @@ -531,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 24 2012 Bastien Nocera 3.5.92-4 +- Use GStreamer 1.0 instead of 0.10 + * Sat Sep 22 2012 Adam Williamson - 3.5.92-3 - backport fix for BGO #678408 (broken message display) From cae36e1c5cd1ba968545ad70a7dfdd9e11c25448 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 Sep 2012 00:01:33 -0400 Subject: [PATCH 8/9] 3.6.0 --- .gitignore | 1 + evolution-3.5.92-flatten.patch | 40 ---------------------------------- evolution.spec | 12 +++++----- sources | 2 +- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 evolution-3.5.92-flatten.patch diff --git a/.gitignore b/.gitignore index 5bae153..ffb8d06 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.90.tar.xz /evolution-3.5.91.tar.xz /evolution-3.5.92.tar.xz +/evolution-3.6.0.tar.xz diff --git a/evolution-3.5.92-flatten.patch b/evolution-3.5.92-flatten.patch deleted file mode 100644 index 509b394..0000000 --- a/evolution-3.5.92-flatten.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c -index b1d726d..520d0b1 100644 ---- a/widgets/misc/e-web-view.c -+++ b/widgets/misc/e-web-view.c -@@ -578,26 +578,23 @@ web_view_navigation_policy_decision_requested_cb (EWebView *web_view, - } - - static void --web_view_load_status_changed_cb (WebKitWebView *web_view, -+web_view_load_status_changed_cb (WebKitWebView *webkit_web_view, - GParamSpec *pspec, - gpointer user_data) - { - WebKitLoadStatus status; -- GtkAllocation allocation, allocation_copy; -+ EWebView *web_view; - -- status = webkit_web_view_get_load_status (web_view); -+ status = webkit_web_view_get_load_status (webkit_web_view); - if (status != WEBKIT_LOAD_FINISHED) - return; - -+ web_view = E_WEB_VIEW (webkit_web_view); -+ web_view_update_document_highlights (web_view); -+ - /* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */ -- gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy); -- allocation = allocation_copy; -- allocation.width -= 10; -- allocation.height -= 10; -- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation); -- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy); -- -- web_view_update_document_highlights (E_WEB_VIEW (web_view)); -+ e_web_view_zoom_in (web_view); -+ e_web_view_zoom_out (web_view); - } - - static void - diff --git a/evolution.spec b/evolution.spec index 2efa6ce..852ad0c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.5.92 -Release: 4%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,9 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# BGO #678408 -Patch03: evolution-3.5.92-flatten.patch - ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -194,7 +191,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .flatten mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -531,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 24 2012 Matthew Barnes - 3.6.0-1 +- Update to 3.6.0 +- Remove patch for GNOME #678408 (fixed upstream). + * Mon Sep 24 2012 Bastien Nocera 3.5.92-4 - Use GStreamer 1.0 instead of 0.10 diff --git a/sources b/sources index 0da0787..83fa0b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d598d3d2c80f3db4c5c7f06f9f96148a evolution-3.5.92.tar.xz +5ceb71ca0bcc1f706f1a3283585c048c evolution-3.6.0.tar.xz From e172530438685c360cbf653f2bb3c211abdb8c14 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Thu, 27 Sep 2012 23:08:37 +0800 Subject: [PATCH 9/9] Update the desktop database in the scriptlets http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#desktop-database --- evolution.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evolution.spec b/evolution.spec index 852ad0c..939fcc5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -300,10 +300,12 @@ grep -v "/usr/share/locale" evolution-%{evo_base_version}.lang > help.lang %post /sbin/ldconfig +/usr/bin/update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun /sbin/ldconfig +/usr/bin/update-desktop-database &> /dev/null || : if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :