[gvfs/f18] Make sure keyring integration is enabled

[Richard Hughes]

commit dad2be9e26043c68458994780d1f26f236495b13
Author: Cosimo Cecchi <cosimoc at gnome.org>
Date:   Mon Aug 27 15:42:17 2012 -0400

    Make sure keyring integration is enabled
    
    Also:
    - fix fuse executable renaming
    - remove obsolete mount-archive.desktop from the files section of the
      archive subpackage, we don't ship that patch anymore
    - correctly package new manual files
    
    Signed-off-by: Richard Hughes <richard at hughsie.com>

 gvfs.spec |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/gvfs.spec b/gvfs.spec
index d1efd6d..92911bb 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.13.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -17,7 +17,7 @@ BuildRequires: libcdio-devel >= 0.78.2
 BuildRequires: libgudev1-devel
 BuildRequires: libsoup-devel >= 2.26.0
 BuildRequires: avahi-glib-devel >= 0.6
-BuildRequires: libgnome-keyring-devel
+BuildRequires: libsecret-devel
 BuildRequires: intltool
 BuildRequires: gettext-devel
 BuildRequires: libudisks2-devel
@@ -149,7 +149,8 @@ to applications using gvfs.
 
 %configure \
         --disable-gdu \
-        --enable-udisks2
+        --enable-udisks2 \
+        --enable-keyring
 make %{?_smp_mflags}
 
 %install
@@ -257,6 +258,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_bindir}/gvfs-tree
 %{_bindir}/gvfs-set-attribute
 %doc %{_mandir}/man1/gvfs-*
+%doc %{_mandir}/man1/gvfsd.1.gz
+%doc %{_mandir}/man1/gvfsd-metadata.1.gz
+%doc %{_mandir}/man7/gvfs.7.gz
 
 %files devel
 %dir %{_includedir}/gvfs-client
@@ -268,8 +272,8 @@ killall -USR1 gvfsd >&/dev/null || :
 
 
 %files fuse
-%{_libexecdir}/gvfs-fuse-daemon
-
+%{_libexecdir}/gvfsd-fuse
+%doc %{_mandir}/man1/gvfsd-fuse.1.gz
 
 %files smb
 %{_libexecdir}/gvfsd-smb
@@ -279,7 +283,6 @@ killall -USR1 gvfsd >&/dev/null || :
 
 
 %files archive
-%{_datadir}/applications/mount-archive.desktop
 %{_libexecdir}/gvfsd-archive
 %{_datadir}/gvfs/mounts/archive.mount
 
@@ -311,6 +314,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/mounts/afp-browse.mount
 
 %changelog
+* Mon Aug 27 2012 Cosimo Cecchi <cosimoc at redhat.com> - 1.13.7-2
+- Make sure keyring integration is enabled
+
 * Tue Aug 21 2012 Richard Hughes <hughsient at gmail.com> - 1.13.7-1
 - Update to 1.13.7