From f1fcb3a246e988f2c465cdc3452672a5ef0e1ef4ac520e35d36953e2a071b6b7 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Mon, 6 Dec 2010 15:11:01 +0000 Subject: [PATCH] Accepting request 54891 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/54891 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=94 --- gvfs.changes | 6 ++++++ gvfs.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gvfs.changes b/gvfs.changes index c0415fe..3a33205 100644 --- a/gvfs.changes +++ b/gvfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 6 16:10:56 CET 2010 - vuntz@opensuse.org + +- Change license of gvfs-backends from LGPLv2.0+ to "LGPLv2.0+ ; + GPLv3": gvfsd-trash has some GPLv3-only code. Fix bnc#653023. + ------------------------------------------------------------------- Fri Nov 19 10:07:00 CET 2010 - vuntz@opensuse.org diff --git a/gvfs.spec b/gvfs.spec index 7c751c1..1f618d2 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -85,7 +85,7 @@ Requires: %{name} = %{version} This package provides a gvfs backend that supports iPod / iPhone devices. %package backends -License: LGPLv2.0+ +License: LGPLv2.0+ ; GPLv3 Summary: VFS functionality for GLib Group: Development/Libraries/C and C++ Requires: %{name} = %{version} @@ -225,6 +225,7 @@ rm -rf %{buildroot} %{_datadir}/%{name}/mounts/smb.mount %{_libexecdir}/%{name}/gvfsd-smb-browse %{_datadir}/%{name}/mounts/smb-browse.mount +# gvfsd-trash is GPLv3 because of trashlib. %{_libexecdir}/%{name}/gvfsd-trash %{_datadir}/%{name}/mounts/trash.mount