[gvfs/f18] Clarify licensing

[Tomas Bzatek]

commit 9ff9dd68f56d8f8c7d36d191cb9cefec0fdb6f41
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Tue Nov 6 17:54:27 2012 +0100

    Clarify licensing
    
    - Explicitly disable HAL

 gvfs.spec |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/gvfs.spec b/gvfs.spec
index d70854b..a2a0e2a 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,8 +1,8 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.14.1
-Release: 1%{?dist}
-License: LGPLv2+
+Release: 2%{?dist}
+License: GPLv3 and LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
 
@@ -165,6 +165,7 @@ automake  || :
 autoconf  || :
 
 %configure \
+        --disable-hal \
         --disable-gdu \
         --enable-udisks2 \
         --enable-keyring
@@ -176,6 +177,9 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.la
 
+# trashlib is GPLv3, include the license
+cp -p daemon/trashlib/COPYING COPYING.GPL3
+
 %find_lang gvfs
 
 %post
@@ -212,7 +216,7 @@ killall -USR1 gvfsd >&/dev/null || :
 %endif
 
 %files -f gvfs.lang
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS COPYING COPYING.GPL3 NEWS README
 %dir %{_datadir}/gvfs
 %dir %{_datadir}/gvfs/mounts
 %{_datadir}/gvfs/mounts/sftp.mount
@@ -330,6 +334,10 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/mounts/afp-browse.mount
 
 %changelog
+* Tue Nov  6 2012 Tomas Bzatek <tbzatek at redhat.com> - 1.14.1-2
+- Clarify licensing
+- Explicitly disable HAL
+
 * Tue Oct 16 2012 Tomas Bzatek <tbzatek at redhat.com> - 1.14.1-1
 - Update to 1.14.1