sync with f15

glib-networking.spec

@@ -1,6 +1,6 @@
 Name:           glib-networking
 Version:        2.28.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Networking support for GLib
 
 Group:          Development/Libraries
@@ -8,17 +8,20 @@ License:        LGPLv2+
 URL:            http://www.gnome.org
 Source:         http://download.gnome.org/sources/glib-networking/2.28/%{name}-%{version}.tar.bz2
 Requires:       ca-certificates
+Requires:       gsettings-desktop-schemas
 
 BuildRequires:  glib2-devel
 BuildRequires:  libproxy-devel
 BuildRequires:  gnutls-devel
 BuildRequires:  intltool
 BuildRequires:  ca-certificates
+BuildRequires:  gsettings-desktop-schemas
 
 %description
-This package contains modules that extend the networking support in GIO.
+This package contains modules that extend the networking support in
-In particular, it contains a libproxy-based GProxyResolver implementation
+GIO. In particular, it contains libproxy- and GSettings-based
-and a gnutls-based GTlsConnection implementation.
+GProxyResolver implementations and a gnutls-based GTlsConnection
+implementation.
 
 %prep
 %setup -q
@@ -48,12 +51,16 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
 %defattr(-,root,root,-)
 %doc COPYING NEWS README
 %{_libdir}/gio/modules/libgiolibproxy.so
+%{_libdir}/gio/modules/libgiognomeproxy.so
 %{_libdir}/gio/modules/libgiognutls.so
 %{_libexecdir}/glib-pacrunner
 %{_datadir}/dbus-1/services/org.gtk.GLib.PACRunner.service
 
 
 %changelog
+* Wed Apr 27 2011 Dan Winship <danw@redhat.com> - 2.28.6.1-2
+- Require gsettings-desktop-schemas, for GNOME proxy support
+
 * Tue Apr 26 2011 Matthias Clasen <mclasen@redhat.com> - 2.28.6.1-1
 - Update to 2.28.6.1