From 1eb22d9039a1ddba1fa7fdc2c28d50a456ea86f4 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@redhat.com>
Date: Fri, 7 Dec 2012 15:36:43 +0100
Subject: [PATCH] Enable verbose build messages

- Remove deprecated Encoding key from mount-archive.desktop

Conflicts:
	gvfs.spec
---
 gvfs-archive-integration.patch |  3 +--
 gvfs.spec                      | 10 +++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/gvfs-archive-integration.patch b/gvfs-archive-integration.patch
index 513dce0..9907245 100644
--- a/gvfs-archive-integration.patch
+++ b/gvfs-archive-integration.patch
@@ -33,9 +33,8 @@ diff -up gvfs-1.3.2/Makefile.am.archive-integration gvfs-1.3.2/Makefile.am
 diff -up /dev/null gvfs-1.3.2/mount-archive.desktop.in.in
 --- /dev/null	2009-07-13 16:21:55.049012465 -0400
 +++ gvfs-1.3.2/mount-archive.desktop.in.in	2009-07-13 22:39:14.844931097 -0400
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,13 @@
 +[Desktop Entry]
-+Encoding=UTF-8
 +_Name=Archive Mounter
 +Exec=@libexecdir@/gvfsd-archive file=%u
 +X-Gnome-Vfs-System=gio
diff --git a/gvfs.spec b/gvfs.spec
index 1a27418..c847b7f 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,8 +1,8 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.15.0
-Release: 2%{?dist}
-License: LGPLv2+
+Release: 3%{?dist}
+License: GPLv3 and LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
 
@@ -166,7 +166,7 @@ autoconf  || :
         --disable-gdu \
         --enable-udisks2 \
         --enable-keyring
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -331,6 +331,10 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/mounts/afp-browse.mount
 
 %changelog
+* Fri Dec  7 2012 Tomas Bzatek <tbzatek@redhat.com> - 1.15.0-3
+- Enable verbose build messages
+- Remove deprecated Encoding key from mount-archive.desktop
+
 * Tue Nov  6 2012 Tomas Bzatek <tbzatek@redhat.com> - 1.15.0-2
 - Clarify licensing
 - Explicitly disable HAL