- updated to 1.8.0; merged from DEVEL

- updated BR

Changed files:
    gvfs.spec -> 1.49

diff --git a/gvfs.spec b/gvfs.spec
index 16202012f85fb4abe96f9b552ff15a6a5175ebb6..9be6df08cc378cfbfff81db8210b7a09ec75075a 100644 (file)
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,13 +1,12 @@
 Summary:       gvfs - userspace virtual filesystem
 Summary(pl.UTF-8):     gvfs - wirtualny system plików w przestrzeni użytkownika
 Name:          gvfs
-Version:       1.6.7
+Version:       1.8.0
 Release:       1
 License:       LGPL v2+
 Group:         Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.6/%{name}-%{version}.tar.bz2
-# Source0-md5: ac249ae10e38cf3d5f779624b81ad3b0
-BuildRequires: GConf2-devel >= 2.28.0
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.8/%{name}-%{version}.tar.bz2
+# Source0-md5: db09c9edcdde9b1166562a4ca54bbaa8
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: avahi-glib-devel >= 0.6.22
@@ -16,25 +15,26 @@ BuildRequires:      cdparanoia-III-devel >= 1:10
 BuildRequires: dbus-glib-devel
 BuildRequires: expat-devel
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.24.0
+BuildRequires: glib2-devel >= 1:2.28.0
 BuildRequires: gnome-disk-utility-devel >= 2.30.0
 BuildRequires: gtk-doc >= 1.8
 BuildRequires: intltool >= 0.40.0
 BuildRequires: libarchive-devel
 BuildRequires: libcdio-devel >= 0.78.2
-BuildRequires: libfuse-devel
+BuildRequires: libfuse-devel >= 2.8.0
 BuildRequires: libgnome-keyring-devel
-BuildRequires: libgphoto2-devel >= 2.4.0
-BuildRequires: libimobiledevice-devel >= 0.9.7
+BuildRequires: libgphoto2-devel >= 2.4.7
+BuildRequires: libimobiledevice-devel >= 1.1.0
+BuildRequires: libplist-devel >= 0.15
 BuildRequires: libsmbclient-devel >= 3.0
 BuildRequires: libsoup-gnome-devel >= 2.26.0
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 1:2.6.31
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
-BuildRequires: sed >= 4.0
+BuildRequires: rpmbuild(macros) >= 1.592
 BuildRequires: udev-glib-devel >= 138
-Requires(post,postun): glib2 >= 1:2.24.0
+Requires(post,postun): glib2 >= 1:2.26.0
 Requires:      %{name}-libs = %{version}-%{release}
 # for gvfs-gdu-volume-monitor:
 Requires:      udisks
@@ -62,7 +62,7 @@ korzystających z gio.
 Summary:       gvfs libraries
 Summary(pl.UTF-8):     Biblioteki gvfs
 Group:         Libraries
-Requires:      glib2 >= 1:2.24.0
+Requires:      glib2 >= 1:2.28.0
 
 %description libs
 gvfs libraries.
@@ -75,7 +75,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.24.0
+Requires:      glib2-devel >= 1:2.28.0
 
 %description devel
 Header files for gvfs library.
@@ -98,9 +98,6 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla gvfs.
 %prep
 %setup -q
 
-%{__sed} -i -e 's/^en@shaw//' po/LINGUAS
-rm -f po/en@shaw.po
-
 %build
 %{__intltoolize}
 %{__libtoolize}
@@ -127,11 +124,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gio/modules/*.{cache,la}
 rm -rf $RPM_BUILD_ROOT
 
 %post
+%glib_compile_schemas
 umask 022
 %{_bindir}/gio-querymodules %{_libdir}/gio/modules
 exit 0
 
 %postun
+if [ "$1" = "0" ]; then
+       %glib_compile_schemas
+fi
 umask 022
 %{_bindir}/gio-querymodules %{_libdir}/gio/modules
 exit 0
@@ -214,6 +215,11 @@ exit 0
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 %{_datadir}/gvfs/remote-volume-monitors/gdu.monitor
 %{_datadir}/gvfs/remote-volume-monitors/gphoto2.monitor
+%{_datadir}/GConf/gsettings/gvfs-dns-sd.convert
+%{_datadir}/GConf/gsettings/gvfs-smb.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.system.dns_sd.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.system.gvfs.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
 
 %files libs
 %defattr(644,root,root,755)