[meego-commits] 24129: Changes to MeeGo:1.2.0:oss:Update:Testing/shared-mime-info

[lionel]

Hi,
I have made the following changes to shared-mime-info in project MeeGo:1.2.0:oss:Update:Testing. Please review and accept ASAP.

Thank You,
lionel

[This message was auto-generated]

---

Request #24129:

  submit:   home:lionel:branches:MeeGo:1.2.0:oss:Update:Testing/shared-mime-info(r4)(cleanup) -> MeeGo:1.2.0:oss:Update:Testing/shared-mime-info


Message:
    * Fri Sep 23 2011 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 0.70
- Fix default html handler (BMC#22884)

State:   new          2011-09-23T09:54:21 lionel
Comment: None



changes files:
--------------
--- shared-mime-info.changes
+++ shared-mime-info.changes
@@ -0,0 +1,3 @@
+* Fri Sep 23 2011 Lionel Landwerlin <lionel.g.landwerlin at linux.intel.com> - 0.70
+- Fix default html handler (BMC#22884)
+
@@ -145 +148 @@
-- rh#179138# add openoffice.org as preferred app for oasis formats 
+- rh#179138# add openoffice.org as preferred app for oasis formats
@@ -197 +200 @@
-- Make helix default for ogg and mp3, will switch wav/flac too 
+- Make helix default for ogg and mp3, will switch wav/flac too

spec files:
-----------
--- shared-mime-info.spec
+++ shared-mime-info.spec
@@ -1,6 +1,6 @@
 # 
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.22
 # 
 # >> macros
 # << macros
@@ -8,7 +8,7 @@
 Name:       shared-mime-info
 Summary:    Shared MIME information database
 Version:    0.70
-Release:    1
+Release:    2
 Group:      System/Libraries
 License:    GPL
 URL:        http://freedesktop.org/Software/shared-mime-info
@@ -75,12 +75,14 @@
 
 
 %post
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 # >> post
 %{_bindir}/update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{_bindir}/update-mime-database %{_datadir}/mime &> /dev/null
 # << post
 
 %postun
+update-desktop-database %{_datadir}/applications &> /dev/null || :
 # >> postun
 %{_bindir}/update-desktop-database %{_datadir}/applications &> /dev/null || :
 # << postun

other changes:
--------------

++++++ defaults.list
--- defaults.list
+++ defaults.list
@@ -78,8 +78,8 @@
 application/x-dvi=tetex-xdvi.desktop
 application/x-rpm=gpk-install-file.desktop
 text/plain=gnome-gedit.desktop
-text/html=moblin-web-browser.desktop;firefox.desktop;google-chrome.desktop;chromium-browser.desktop
-application/xhtml+xml=moblin-web-browser.desktop;firefox.desktop;google-chrome.desktop;chromium-browser.desktop
+text/html=chromium-browser-ext.desktop;firefox.desktop;google-chrome.desktop;chromium-browser.desktop
+application/xhtml+xml=chromium-browser-ext.desktop;firefox.desktop;google-chrome.desktop;chromium-browser.desktop
 inode/directory=gnome-nautilus-folder-handler.desktop
 x-content/blank-cd=nautilus-cd-burner.desktop
 x-content/blank-dvd=nautilus-cd-burner.desktop

++++++ shared-mime-info.yaml
--- shared-mime-info.yaml
+++ shared-mime-info.yaml
@@ -1,7 +1,7 @@
 Name: shared-mime-info
 Summary: Shared MIME information database
 Version: 0.70
-Release: 1
+Release: 2
 Group: System/Libraries
 License: GPL
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -13,7 +13,7 @@
     - totem-defaults.list
 Description: |
     This is the freedesktop.org shared MIME info database.
-    
+
     Many programs and desktops use the MIME system to represent the types of
     files. Frequently, it is necessary to work out the correct MIME type for
     a file. This is generally done by examining the file's name or contents,
@@ -21,7 +21,7 @@
 
 NoAutoLocale: yes
 UpdateDesktopDB: yes
-PkgConfigBR: 
+PkgConfigBR:
     - libxml-2.0
     - glib-2.0
 RequiresPost: