From 262991ff10d71561679436a7c53e4856a1e22496253644459b1b080d93dfbe5e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 10 Jan 2011 09:54:05 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/evolution revision 98.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=806132587cad71a81af55ed4f47f2122 --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 1b902c5..81d9508 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,7 +1,7 @@ # # spec file for package evolution (Version 2.32.1) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -69,7 +69,7 @@ Group: Productivity/Networking/Email/Clients # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 2.32 Version: 2.32.1 -Release: 2 +Release: 3 # FIXME: Check if libmono-2_0-1 is dragged in by libmono-2_0-devel, then remove this BR (in mono-plugins subpackage). # FIXME: check with upstream/meego if we want to enable clutter for express mode Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite From 0b0d4a7db62f8c40b98217be2c90119a34090f07649a780621e390b404ad199a Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 14 Feb 2011 11:24:22 +0000 Subject: [PATCH 2/2] Accepting request 61146 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/61146 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=109 --- evolution.changes | 13 +++++++++++++ evolution.spec | 17 ++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/evolution.changes b/evolution.changes index 507d283..46d10e6 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sun Feb 13 14:03:33 CET 2011 - vuntz@opensuse.org + +- Call missing relevant macros in %post/%postun: + + %icon_theme_cache_post/postun because the package ships themed + icons. +- Stop calling %mime_database_post/postun: there is no mime type + definition. +- Pass %{?no_lang_C} to %find_lang so that english documentation + can be packaged with the program, and not in the lang subpackage. +- Change Requires of lang subpackage to Recommends, since the + english documentation is not there anymore. + ------------------------------------------------------------------- Sat Dec 18 23:38:40 UTC 2010 - badshah400@gmail.com diff --git a/evolution.spec b/evolution.spec index 81d9508..c9140bf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -96,8 +96,8 @@ Patch54: bnc-445996-address-conflict.patch Patch55: evolution-mono2.patch Url: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: %{name}-lang Recommends: bogofilter -Requires: %{name}-lang = %{version} %gconf_schemas_prereq %description @@ -231,8 +231,8 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de %suse_update_desktop_file -r -G "Mail and Calendar" -N "Evolution" -D "evolution" evolution GNOME GTK Network Email Calendar ContactManagement %suse_update_desktop_file evolution-alarm-notify %suse_update_desktop_file evolution-settings -%find_lang evolution-%evolution_base_version -%find_lang evolution evolution-%evolution_base_version.lang +%find_lang evolution-%evolution_base_version %{?no_lang_C} +%find_lang evolution %{?no_lang_C} evolution-%evolution_base_version.lang %find_gconf_schemas %{__rm} -r %{buildroot}%{_datadir}/mime-info %if %USE_EVOLDAP @@ -249,7 +249,7 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de %post %desktop_database_post -%mime_database_post +%icon_theme_cache_post %posttrans -f %{name}.schemas_posttrans @@ -257,11 +257,18 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de %postun %desktop_database_postun -%mime_database_postun +%icon_theme_cache_postun %files -f %{name}.schemas_list %defattr(-,root,root) %doc AUTHORS COPYING COPYING.LGPL2 COPYING.LGPL3 COPYING-DOCS COPYING.OPENLDAP ChangeLog MAINTAINERS NEWS NEWS-1.0 README +%dir %{_datadir}/gnome/ +%dir %{_datadir}/gnome/help/ +%dir %{_datadir}/gnome/help/%{name}/ +%doc %{_datadir}/gnome/help/%{name}/C/ +%dir %{_datadir}/omf/ +%dir %{_datadir}/omf/%{name}/ +%doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_bindir}/* %{_datadir}/applications/*.desktop %{_datadir}/evolution