- updated to 1.0.1; merged changes from DEVEL

Changed files:
    gvfs.spec -> 1.20

diff --git a/gvfs.spec b/gvfs.spec
index 3d96122bcde4d2b2889e1b01f1778331cf59ea1c..747aa407e135d147b9e36a6490a3a2a67e539d42 100644 (file)
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,12 +1,12 @@
 Summary:       gvfs - userspace virtual filesystem
 Summary(pl.UTF-8):     gvfs - wirtualny system plików w przestrzeni użytkownika
 Name:          gvfs
-Version:       0.2.5
-Release:       2
+Version:       1.0.1
+Release:       1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gvfs/0.2/%{name}-%{version}.tar.bz2
-# Source0-md5: 01676053d9481022ade9a5274576541b
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.0/%{name}-%{version}.tar.bz2
+# Source0-md5: 0d123f87e3e660271cd9d11b8c592c5a
 BuildRequires: GConf2-devel >= 2.22.0
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -16,7 +16,7 @@ BuildRequires:        cdparanoia-III-devel >= 1:10
 BuildRequires: dbus-glib-devel
 BuildRequires: expat-devel
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.16.1
+BuildRequires: glib2-devel >= 1:2.18.0
 BuildRequires: gnome-keyring-devel >= 2.22.0
 BuildRequires: gtk-doc >= 1.8
 BuildRequires: hal-devel >= 0.5.10
@@ -26,7 +26,7 @@ BuildRequires:        libcdio-devel >= 0.78.2
 BuildRequires: libfuse-devel
 BuildRequires: libgphoto2-devel
 BuildRequires: libsmbclient-devel >= 3.0
-BuildRequires: libsoup-devel >= 2.4.0
+BuildRequires: libsoup-devel >= 2.23.91
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 1:2.6.31
 BuildRequires: pkgconfig
@@ -54,7 +54,7 @@ korzystających z gio.
 Summary:       gvfs libraries
 Summary(pl.UTF-8):     Biblioteki gvfs
 Group:         Libraries
-Requires:      glib2 >= 1:2.16.1
+Requires:      glib2 >= 1:2.18.0
 
 %description libs
 gvfs libraries.
@@ -67,7 +67,7 @@ Summary:      Header files for gvfs library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki gvfs
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.16.1
+Requires:      glib2-devel >= 1:2.18.0
 
 %description devel
 Header files for gvfs library.
@@ -124,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gvfs-trash
 %attr(755,root,root) %{_bindir}/gvfs-tree
 %attr(755,root,root) %{_libdir}/gio/modules/libgiogconf.so
-%attr(755,root,root) %{_libdir}/gio/modules/libgiohal-volume-monitor.so
+%attr(755,root,root) %{_libdir}/gio/modules/libgioremote-volume-monitor.so
 %attr(755,root,root) %{_libdir}/gio/modules/libgvfsdbus.so
 %dir %{_libexecdir}
 %attr(755,root,root) %{_libexecdir}/gvfsd
@@ -145,10 +145,15 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libexecdir}/gvfsd-smb-browse
 %attr(755,root,root) %{_libexecdir}/gvfsd-trash
 %attr(755,root,root) %{_libexecdir}/gvfs-fuse-daemon
+%attr(755,root,root) %{_libexecdir}/gvfs-gphoto2-volume-monitor
+%attr(755,root,root) %{_libexecdir}/gvfs-hal-volume-monitor
 %attr(755,root,root) %{_sysconfdir}/profile.d/gvfs-bash-completion.sh
 %{_datadir}/dbus-1/services/gvfs-daemon.service
+%{_datadir}/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.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/archive.mount
 %{_datadir}/gvfs/mounts/burn.mount
 %{_datadir}/gvfs/mounts/cdda.mount
@@ -165,6 +170,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gvfs/mounts/smb-browse.mount
 %{_datadir}/gvfs/mounts/smb.mount
 %{_datadir}/gvfs/mounts/trash.mount
+%{_datadir}/gvfs/remote-volume-monitors/gphoto2.monitor
+%{_datadir}/gvfs/remote-volume-monitors/hal.monitor
 
 %files libs
 %defattr(644,root,root,755)