Tue Jul 14 03:08:46 UTC 2009

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17086

Modified Files:
	.cvsignore gvfs.spec sources 
Added Files:
	gvfs-archive-integration.patch 
Removed Files:
	0001-FTP-prepare-the-code-for-active-FTP-support.patch 
	0002-FTP-Bug-516704-Be-able-to-connect-to-an-Active-FTP-S.patch 
	0004-FTP-add-the-error-code-for-EPRT-s-522-error.patch 
	0005-FTP-add-EPRT-support.patch 
	0006-Bug-582772-gvfsd-computer-crashes-with-SEGSEV-in-rec.patch 
	0007-Better-handling-of-PC-floppy-drives.patch 
	0008-FTP-use-the-EPRT-feature-response-for-EPRT-support-n.patch 
	0009-FTP-remove-EPSV-as-default-feature.patch 
	gvfs-0.99.2-archive-integration.patch 
	gvfs-1.1.7-gdu-computer-expose-devices.patch 
Log Message:
1.3.2


gvfs-archive-integration.patch:

--- NEW FILE gvfs-archive-integration.patch ---
diff -up gvfs-1.3.2/Makefile.am.archive-integration gvfs-1.3.2/Makefile.am
--- gvfs-1.3.2/Makefile.am.archive-integration	2009-06-25 19:55:39.000000000 -0400
+++ gvfs-1.3.2/Makefile.am	2009-07-13 22:51:52.480693853 -0400
@@ -1,5 +1,19 @@
 NULL =
 
+ at INTLTOOL_DESKTOP_RULE@
+
+desktop_in_files = mount-archive.desktop.in
+
+mount-archive.desktop.in: mount-archive.desktop.in.in
+	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+desktopdir       = $(datadir)/applications
+if HAVE_ARCHIVE
+desktop_DATA     = mount-archive.desktop
+else
+desktop_DATA     =
+endif
+
 SUBDIRS = \
 	common \
 	metadata \
@@ -19,6 +33,8 @@ EXTRA_DIST = \
 	gvfs.doap		\
 	README.commits		\
 	MAINTAINERS		\
+	mount-archive.desktop.in.in \
+	$(desktop_in_files)     \
 	$(NULL)
 
 DISTCLEANFILES = \
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 @@
+[Desktop Entry]
+Encoding=UTF-8
+_Name=Archive Mounter
+Exec=@libexecdir@/gvfsd-archive file=%u
+X-Gnome-Vfs-System=gio
+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar;
+Terminal=false
+StartupNotify=false
+Type=Application
+NoDisplay=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gvfs
+X-GNOME-Bugzilla-Component=archive-backend
+X-GNOME-Bugzilla-Version=@VERSION@


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore	16 Jun 2009 03:50:56 -0000	1.42
+++ .cvsignore	14 Jul 2009 03:08:45 -0000	1.43
@@ -1 +1 @@
-gvfs-1.3.1.tar.bz2
+gvfs-1.3.2.tar.bz2


Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -p -r1.136 -r1.137
--- gvfs.spec	22 Jun 2009 13:46:12 -0000	1.136
+++ gvfs.spec	14 Jul 2009 03:08:46 -0000	1.137
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.3.1
-Release: 2%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -33,26 +33,13 @@ Requires(postun): desktop-file-utils
 BuildRequires: automake autoconf
 BuildRequires: libtool
 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
-Patch1: gvfs-0.99.2-archive-integration.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=573826
-Patch2: gvfs-1.1.7-gdu-computer-expose-devices.patch
+Patch1: gvfs-archive-integration.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=497631 
 Patch8: gvfs-1.2.2-dnssd-deadlock.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=504339
 Patch9: gvfs-1.2.3-sftp-40sec-timeout.patch
 
 
-# Backports from trunk
-Patch100: 0001-FTP-prepare-the-code-for-active-FTP-support.patch
-Patch101: 0002-FTP-Bug-516704-Be-able-to-connect-to-an-Active-FTP-S.patch
-Patch102: 0004-FTP-add-the-error-code-for-EPRT-s-522-error.patch
-Patch103: 0005-FTP-add-EPRT-support.patch
-Patch104: 0006-Bug-582772-gvfsd-computer-crashes-with-SEGSEV-in-rec.patch
-Patch105: 0007-Better-handling-of-PC-floppy-drives.patch
-Patch106: 0008-FTP-use-the-EPRT-feature-response-for-EPRT-support-n.patch
-Patch107: 0009-FTP-remove-EPSV-as-default-feature.patch
-
-
 %description
 The gvfs package provides backend implementations for the gio
 framework in GLib. It includes ftp, sftp, cifs.
@@ -134,20 +121,10 @@ media players (Media Transfer Protocol) 
 
 %prep
 %setup -q
-%patch1 -p0 -b .archive-integration
-%patch2 -p1 -b .computer-expose-devices
+%patch1 -p1 -b .archive-integration
 %patch8 -p1 -b .dnssd-deadlock
 %patch9 -p1 -b .sftp-timeout
 
-%patch100 -p1
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-%patch106 -p1
-%patch107 -p1
-
 %build
 
 # Needed for gvfs-0.2.1-archive-integration.patch
@@ -203,6 +180,7 @@ update-desktop-database &> /dev/null ||:
 %{_datadir}/gvfs/mounts/network.mount
 %{_datadir}/gvfs/mounts/ftp.mount
 %{_datadir}/dbus-1/services/gvfs-daemon.service
+%{_datadir}/dbus-1/services/gvfs-metadata.service
 %{_datadir}/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
 %{_datadir}/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service
 %{_datadir}/gvfs/remote-volume-monitors/hal.monitor
@@ -225,6 +203,7 @@ update-desktop-database &> /dev/null ||:
 %{_libexecdir}/gvfsd-burn
 %{_libexecdir}/gvfsd-dnssd
 %{_libexecdir}/gvfsd-network
+%{_libexecdir}/gvfsd-metadata
 %{_libexecdir}/gvfs-hal-volume-monitor
 %{_libexecdir}/gvfs-gdu-volume-monitor
 %{_bindir}/gvfs-cat
@@ -243,6 +222,7 @@ update-desktop-database &> /dev/null ||:
 %{_bindir}/gvfs-save
 %{_bindir}/gvfs-trash
 %{_bindir}/gvfs-tree
+%{_bindir}/gvfs-set-attribute
 
 %files devel
 %defattr(-, root, root, -)
@@ -290,6 +270,10 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Mon Jul 13 2009 Matthias Clasen <mclasen at redhat.com> - 1.3.2-1
+- Update to 1.3.2
+- Drop upstreamed patches
+
 * Mon Jun 22 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.3.1-2
 - Bump version requirements
 - Backport FTP and Computer backend patches from master


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	16 Jun 2009 03:50:56 -0000	1.42
+++ sources	14 Jul 2009 03:08:46 -0000	1.43
@@ -1 +1 @@
-78f5b53fb965e3daefb54dcc6f27900c  gvfs-1.3.1.tar.bz2
+73a7aecfba767f80146cbd5d37598e8b  gvfs-1.3.2.tar.bz2


--- 0001-FTP-prepare-the-code-for-active-FTP-support.patch DELETED ---


--- 0002-FTP-Bug-516704-Be-able-to-connect-to-an-Active-FTP-S.patch DELETED ---


--- 0004-FTP-add-the-error-code-for-EPRT-s-522-error.patch DELETED ---


--- 0005-FTP-add-EPRT-support.patch DELETED ---


--- 0006-Bug-582772-gvfsd-computer-crashes-with-SEGSEV-in-rec.patch DELETED ---


--- 0007-Better-handling-of-PC-floppy-drives.patch DELETED ---


--- 0008-FTP-use-the-EPRT-feature-response-for-EPRT-support-n.patch DELETED ---


--- 0009-FTP-remove-EPSV-as-default-feature.patch DELETED ---


--- gvfs-0.99.2-archive-integration.patch DELETED ---


--- gvfs-1.1.7-gdu-computer-expose-devices.patch DELETED ---


