[meego-commits] 5166: Changes to Trunk/gvfs

[Anas Nashif]

Hi,
I have made the following changes to gvfs in project Trunk. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #5166:

  submit:   Trunk:Testing/gvfs(r9) -> Trunk/gvfs


Message:
    migrate from Testing after handset day1

State:   new          2010-06-30T14:58:20 nashif
Comment: None



changes files:
--------------
--- gvfs.changes
+++ gvfs.changes
@@ -0,0 +1,6 @@
+* Mon Jun 28 2010 Yan Yin <yan.yin at intel.com> - 1.6.2
+- Fix the license in spec/yaml since daemon/trashlib files belongs to GPLv3
+
+* Thu Jun 24 2010 Yan Yin <yan.yin at intel.com> - 1.6.2
+- Update to 1.6.2
+

old:
----
  gvfs-1.6.0.tar.bz2

new:
----
  gvfs-1.6.2.tar.bz2

spec files:
-----------
--- gvfs.spec
+++ gvfs.spec
@@ -1,16 +1,16 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.16
+# spectacle version 0.17
 # 
 # >> macros
 # << macros
 
 Name:       gvfs
 Summary:    Backends for the gio framework in GLib
-Version:    1.6.0
+Version:    1.6.2
 Release:    1
 Group:      System/Libraries
-License:    LGPLv2+
+License:    LGPLv2+ and GPLv3
 URL:        http://www.gtk.org
 Source0:    http://download.gnome.org/sources/gvfs/1.6/gvfs-%{version}.tar.bz2
 Source100:  gvfs.yaml
@@ -43,6 +43,7 @@
 BuildRequires:  GConf2-devel
 BuildRequires:  expat-devel
 
+
 %description
 The gvfs package provides backend implementations for the gio
 framework in GLib. It includes ftp, sftp, cifs.
@@ -53,8 +54,6 @@
 Summary:    Archiving support for gvfs
 Group:      System/Libraries
 Requires:   %{name} = %{version}-%{release}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
 
 %description archive
 This package provides support for accessing files inside Zip and Tar archives,
@@ -156,11 +155,7 @@
 
 
 
-%post archive
-update-desktop-database %{_datadir}/applications &> /dev/null || :
 
-%postun archive
-update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 
 

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

++++++ gvfs-1.6.0.tar.bz2 -> gvfs-1.6.2.tar.bz2
48050 lines of diff (skipped)

++++++ gvfs.yaml
--- gvfs.yaml
+++ gvfs.yaml
@@ -1,9 +1,9 @@
 Name: gvfs
 Summary: Backends for the gio framework in GLib
-Version: 1.6.0
+Version: 1.6.2
 Release: 1
 Group: System/Libraries
-License: LGPLv2+
+License: LGPLv2+ and GPLv3
 URL: http://www.gtk.org
 LocaleName: gvfs
 Sources: