packages: gvfs/gvfs.spec - updated to 1.6.0; merged changes from DEVEL

[megabajt]

Author: megabajt                     Date: Mon Mar 29 16:42:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.6.0; merged changes from DEVEL

---- Files affected:
packages/gvfs:
   gvfs.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: packages/gvfs/gvfs.spec
diff -u packages/gvfs/gvfs.spec:1.37 packages/gvfs/gvfs.spec:1.38
--- packages/gvfs/gvfs.spec:1.37	Wed Jan 20 20:55:13 2010
+++ packages/gvfs/gvfs.spec	Mon Mar 29 18:42:26 2010
@@ -2,12 +2,12 @@
 Summary:	gvfs - userspace virtual filesystem
 Summary(pl.UTF-8):	gvfs - wirtualny system plików w przestrzeni użytkownika
 Name:		gvfs
-Version:	1.4.3
-Release:	4
+Version:	1.6.0
+Release:	1
 License:	LGPL v2+
 Group:		Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.4/%{name}-%{version}.tar.bz2
-# Source0-md5:	2624e5e7d45efd6b742e90bfde24cd20
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.6/%{name}-%{version}.tar.bz2
+# Source0-md5:	fb533047ddd894ec5c811b005cb88a07
 BuildRequires:	GConf2-devel >= 2.28.0
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -17,25 +17,27 @@
 BuildRequires:	dbus-glib-devel
 BuildRequires:	expat-devel
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.22.0
-BuildRequires:	gnome-disk-utility-devel >= 0.5
-BuildRequires:	gnome-keyring-devel >= 2.28.0
+BuildRequires:	glib2-devel >= 1:2.24.0
+BuildRequires:	gnome-disk-utility-devel >= 2.30.0
 BuildRequires:	gtk-doc >= 1.8
-BuildRequires:	hal-devel >= 0.5.10
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libarchive-devel
 BuildRequires:	libcdio-devel >= 0.78.2
 BuildRequires:	libfuse-devel
+BuildRequires:	libgnome-keyring-devel
 BuildRequires:	libgphoto2-devel >= 2.4.0
+BuildRequires:	libimobiledevice-devel >= 0.9.7
 BuildRequires:	libsmbclient-devel >= 3.0
 BuildRequires:	libsoup-gnome-devel >= 2.26.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel >= 1:2.6.31
 BuildRequires:	pkgconfig
+BuildRequires:	sed >= 4.0
 BuildRequires:	udev-glib-devel >= 138
+Requires(post,postun):	glib2 >= 1:2.24.0
 Requires:	%{name}-libs = %{version}-%{release}
 # for gvfs-gdu-volume-monitor:
-Requires:	DeviceKit-disks
+Requires:	udisks
 Suggests:	obex-data-server >= 0.4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,7 +62,7 @@
 Summary:	gvfs libraries
 Summary(pl.UTF-8):	Biblioteki gvfs
 Group:		Libraries
-Requires:	glib2 >= 1:2.22.0
+Requires:	glib2 >= 1:2.24.0
 
 %description libs
 gvfs libraries.
@@ -73,7 +75,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki gvfs
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.22.0
+Requires:	glib2-devel >= 1:2.24.0
 
 %description devel
 Header files for gvfs library.
@@ -96,6 +98,9 @@
 %prep
 %setup -q
 
+%{__sed} -i -e 's/^en at shaw//' po/LINGUAS
+rm -f po/en at shaw.po
+
 %build
 %{__intltoolize}
 %{__libtoolize}
@@ -104,6 +109,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	--disable-silent-rules \
 	--with-bash-completion-dir=%{_sysconfdir}/bash_completion.d
 %{__make}
 
@@ -113,13 +119,23 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{cache,la}
 
 %find_lang gvfs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+umask 022
+%{_bindir}/gio-querymodules %{_libdir}/gio/modules
+exit 0
+
+%postun
+umask 022
+%{_bindir}/gio-querymodules %{_libdir}/gio/modules
+exit 0
+
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
@@ -148,6 +164,7 @@
 %attr(755,root,root) %{_libdir}/gio/modules/libgvfsdbus.so
 %dir %{_libexecdir}
 %attr(755,root,root) %{_libexecdir}/gvfsd
+%attr(755,root,root) %{_libexecdir}/gvfsd-afc
 %attr(755,root,root) %{_libexecdir}/gvfsd-archive
 %attr(755,root,root) %{_libexecdir}/gvfsd-burn
 %attr(755,root,root) %{_libexecdir}/gvfsd-cdda
@@ -165,18 +182,19 @@
 %attr(755,root,root) %{_libexecdir}/gvfsd-smb
 %attr(755,root,root) %{_libexecdir}/gvfsd-smb-browse
 %attr(755,root,root) %{_libexecdir}/gvfsd-trash
+%attr(755,root,root) %{_libexecdir}/gvfs-afc-volume-monitor
 %attr(755,root,root) %{_libexecdir}/gvfs-fuse-daemon
 %attr(755,root,root) %{_libexecdir}/gvfs-gphoto2-volume-monitor
 %attr(755,root,root) %{_libexecdir}/gvfs-gdu-volume-monitor
-%attr(755,root,root) %{_libexecdir}/gvfs-hal-volume-monitor
 %{_datadir}/dbus-1/services/gvfs-daemon.service
 %{_datadir}/dbus-1/services/gvfs-metadata.service
+%{_datadir}/dbus-1/services/org.gtk.Private.AfcVolumeMonitor.service
 %{_datadir}/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
 %{_datadir}/dbus-1/services/org.gtk.Private.GduVolumeMonitor.service
-%{_datadir}/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
 %dir %{_datadir}/gvfs
 %dir %{_datadir}/gvfs/mounts
 %dir %{_datadir}/gvfs/remote-volume-monitors
+%{_datadir}/gvfs/mounts/afc.mount
 %{_datadir}/gvfs/mounts/archive.mount
 %{_datadir}/gvfs/mounts/burn.mount
 %{_datadir}/gvfs/mounts/cdda.mount
@@ -194,9 +212,9 @@
 %{_datadir}/gvfs/mounts/smb-browse.mount
 %{_datadir}/gvfs/mounts/smb.mount
 %{_datadir}/gvfs/mounts/trash.mount
+%{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 %{_datadir}/gvfs/remote-volume-monitors/gdu.monitor
 %{_datadir}/gvfs/remote-volume-monitors/gphoto2.monitor
-%{_datadir}/gvfs/remote-volume-monitors/hal.monitor
 
 %files libs
 %defattr(644,root,root,755)
@@ -223,6 +241,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2010/03/29 16:42:26  megabajt
+- updated to 1.6.0; merged changes from DEVEL
+
+Revision 1.37.2.2  2010/03/25 20:12:43  megabajt
+- updated to 1.5.5
+
+Revision 1.37.2.1  2010/02/11 21:08:02  megabajt
+- updated to 1.5.3
+- removed en at shaw locale
+
 Revision 1.37  2010/01/20 19:55:13  blues
 - rel.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gvfs/gvfs.spec?r1=1.37&r2=1.38&f=u