[meego-commits] 5303: Changes to Trunk:Testing/gvfs

[Yan Yin]

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

Thank You,
Yan Yin

[This message was auto-generated]

---

Request #5303:

  submit:   home:yyin2:branches:Trunk:Testing/gvfs(r3)(cleanup) -> Trunk:Testing/gvfs


Message:
    Split GPLv3 component into gvfs-trash

State:   new          2010-07-01T16:02:36 yyin2
Comment: None



changes files:
--------------
--- gvfs.changes
+++ gvfs.changes
@@ -0,0 +1,3 @@
+* Fri Jul 02 2010 Yan Yin <yan.yin at intel.com> - 1.6.2
+- Split gvfs-trash due to GPLv3 issue
+

spec files:
-----------
--- gvfs.spec
+++ gvfs.spec
@@ -114,6 +114,15 @@
 required to develop applications using gvfs.
 
 
+%package trash
+Summary:    trash support for gvfs
+Group:      System/Libraries
+Requires:   %{name} = %{version}-%{release}
+
+%description trash
+gvfs-trash/gvfsd-trash/trash.mount are removed from default package due to GPLv3 issue.
+
+
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -172,6 +181,9 @@
 
 
 
+
+
+
 %files -f gvfs.lang
 %defattr(-,root,root,-)
 # >> files
@@ -180,7 +192,6 @@
 %dir %{_datadir}/gvfs/mounts
 %{_sysconfdir}/profile.d/gvfs-bash-completion.sh
 %{_datadir}/gvfs/mounts/sftp.mount
-%{_datadir}/gvfs/mounts/trash.mount
 %{_datadir}/gvfs/mounts/computer.mount
 %{_datadir}/gvfs/mounts/dav.mount
 %{_datadir}/gvfs/mounts/http.mount
@@ -202,7 +213,6 @@
 %{_libexecdir}/gvfsd
 %{_libexecdir}/gvfsd-ftp
 %{_libexecdir}/gvfsd-sftp
-%{_libexecdir}/gvfsd-trash
 %{_libexecdir}/gvfs-gdu-volume-monitor
 %{_libexecdir}/gvfsd-computer
 %{_libexecdir}/gvfsd-dav
@@ -226,7 +236,6 @@
 %{_bindir}/gvfs-rename
 %{_bindir}/gvfs-rm
 %{_bindir}/gvfs-save
-%{_bindir}/gvfs-trash
 %{_bindir}/gvfs-tree
 %{_bindir}/gvfs-set-attribute
 # << files
@@ -283,3 +292,11 @@
 %{_libdir}/libgvfscommon-dnssd.so
 # << files devel
 
+%files trash
+%defattr(-,root,root,-)
+# >> files trash
+%{_bindir}/gvfs-trash
+%{_libexecdir}/gvfsd-trash
+%{_datadir}/gvfs/mounts/trash.mount
+# << files trash
+

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

++++++ gvfs.yaml
--- gvfs.yaml
+++ gvfs.yaml
@@ -88,7 +88,6 @@
           media players (Media Transfer Protocol) to applications using gvfs.
       Requires:
           - fuse
-    
 
     - Name: devel
       Summary: Development files for gvfs
@@ -97,3 +96,10 @@
           The gvfs-devel package contains headers and other files that are
           required to develop applications using gvfs.
 
+    - Name: trash
+      Summary: trash support for gvfs
+      Group: System/Libraries
+      Description: |
+          gvfs-trash/gvfsd-trash/trash.mount are removed from default package due to GPLv3 issue.
+
+