- updated desktop files (added missing MimeTypes)

- release 2

Changed files:
    evolution-addressbook.desktop -> 1.5
    evolution-calendar.desktop -> 1.5
    evolution-mail.desktop -> 1.7
    evolution-tasks.desktop -> 1.5
    evolution.spec -> 1.290

diff --git a/evolution-addressbook.desktop b/evolution-addressbook.desktop
index 18d032f3869469a9a66a7cc6efef7ba0143029e2..60d99f2b6f96baa40a33058ac23e6c498d345731 100644 (file)
--- a/evolution-addressbook.desktop
+++ b/evolution-addressbook.desktop
@@ -52,11 +52,11 @@ Exec=evolution -c contacts
 Icon=stock_addressbook
 Terminal=false
 Type=Application
-Categories=GTK;GNOME;Utility;
+Categories=GTK;GNOME;Office;ContactManagement;
 StartupNotify=true
-MimeType=text/x-vcard;
+MimeType=text/x-vcard;text/directory;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=Evolution
 X-GNOME-Bugzilla-Component=BugBuddyBugs
-X-GNOME-Bugzilla-Version=2.28.x
-X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.28;evolution-exchange-storage;evolution-alarm-notify;
+X-GNOME-Bugzilla-Version=3.0.x
+X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory

diff --git a/evolution-calendar.desktop b/evolution-calendar.desktop
index d522b09710e2edd5ac7fe23b6192aced5cf5e185..2697f29da5f36e38edeb3484da097c50f1b5aad8 100644 (file)
--- a/evolution-calendar.desktop
+++ b/evolution-calendar.desktop
@@ -54,8 +54,9 @@ Terminal=false
 Type=Application
 Categories=GTK;GNOME;Office;Calendar;
 StartupNotify=true
+MimeType=text/calendar;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=Evolution
 X-GNOME-Bugzilla-Component=BugBuddyBugs
-X-GNOME-Bugzilla-Version=2.28.x
-X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.28;evolution-exchange-storage;evolution-alarm-notify;
+X-GNOME-Bugzilla-Version=3.0.x
+X-GNOME-Bugzilla-OtherBinaries=e-calendar-factory

diff --git a/evolution-mail.desktop b/evolution-mail.desktop
index c1e5a8d73bf437a1fb1956fc23c6fe841c8c69e8..0b0831922ada4db6d88beded8888b2366df26b94 100644 (file)
--- a/evolution-mail.desktop
+++ b/evolution-mail.desktop
@@ -52,10 +52,10 @@ Exec=evolution -c mail
 Icon=evolution
 Terminal=false
 Type=Application
-Categories=GTK;GNOME;Network;Email;
+Categories=GTK;GNOME;Office;Network;Email;
 StartupNotify=true
+MimeType=application/mbox;message/rfc822;x-scheme-handler/mailto;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=Evolution
 X-GNOME-Bugzilla-Component=BugBuddyBugs
-X-GNOME-Bugzilla-Version=2.28.x
-X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.28;evolution-exchange-storage;evolution-alarm-notify;
+X-GNOME-Bugzilla-Version=3.0.x

diff --git a/evolution-tasks.desktop b/evolution-tasks.desktop
index 33234b284795625b940d64a6af2b7fcc2a3afbe6..51a46e57edc567c568fe5c87408d9f5127f35021 100644 (file)
--- a/evolution-tasks.desktop
+++ b/evolution-tasks.desktop
@@ -57,5 +57,4 @@ StartupNotify=true
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=Evolution
 X-GNOME-Bugzilla-Component=BugBuddyBugs
-X-GNOME-Bugzilla-Version=2.28.x
-X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.28;evolution-exchange-storage;evolution-alarm-notify;
+X-GNOME-Bugzilla-Version=3.0.x

diff --git a/evolution.spec b/evolution.spec
index ce065853a62f50f81e1d5282d54bfb800297484a..f1ab19e77eda49deffc7b15cc021699cdd7bc22e 100644 (file)
--- a/evolution.spec
+++ b/evolution.spec
@@ -11,7 +11,7 @@ Summary(pt_BR.UTF-8): Cliente de email integrado com calendário e catálogo de
 Summary(zh_CN.UTF-8):  Evolution - GNOME个人和工作组信息管理工具(包括电子邮件，日历和地址薄)
 Name:          evolution
 Version:       3.0.1
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/evolution/3.0/%{name}-%{version}.tar.bz2
@@ -164,6 +164,7 @@ aplicações.
 Summary:       Evolution mail component
 Summary(pl.UTF-8):     Moduł pocztowy Evolution
 Group:         X11/Applications/Mail
+Requires(post,postun): desktop-file-utils
 Requires(post,preun):  GConf2
 # mail composer requires addressbook component
 Requires:      %{name}-addressbook = %{version}-%{release}
@@ -194,6 +195,7 @@ Książka adresowa Evolution.
 Summary:       Evolution calendar and todo component
 Summary(pl.UTF-8):     Moduł kalendarza i listy zadań Evolution
 Group:         X11/Applications
+Requires(post,postun): desktop-file-utils
 Requires(post,preun):  GConf2
 Requires:      %{name} = %{version}-%{release}
 Provides:      %{name}-component = %{version}-%{release}
@@ -308,6 +310,7 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_install apps_evolution_email_custom_header.schemas
 %gconf_schema_install bogo-junk-plugin.schemas
 %gconf_schema_install evolution-mail.schemas
+%update_desktop_database_post
 
 %preun mail
 %gconf_schema_uninstall apps-evolution-attachment-reminder.schemas
@@ -318,6 +321,9 @@ rm -rf $RPM_BUILD_ROOT
 %gconf_schema_uninstall bogo-junk-plugin.schemas
 %gconf_schema_uninstall evolution-mail.schemas
 
+%postun main
+%update_desktop_database_postun
+
 %post addressbook
 %update_desktop_database_post
 %gconf_schema_install apps_evolution_addressbook.schemas
@@ -330,10 +336,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %post calendar
 %gconf_schema_install apps_evolution_calendar.schemas
+%update_desktop_database_post
 
 %preun calendar
 %gconf_schema_uninstall apps_evolution_calendar.schemas
 
+%postun calendar
+%update_desktop_database_postun
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS* README