[gnome-settings-daemon/f17] Do not install security updates automatically

[Richard Hughes]

commit ecc58ea34300a52f72f547fe53889f06b202a852
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue May 8 13:37:45 2012 +0100

    Do not install security updates automatically
    
    - Resolves #755335

 gnome-settings-daemon.spec         |   14 +++++++++++++-
 gsd-auto-update-type-is-none.patch |   13 +++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 81c5fc2..413dade 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
 Version:        3.4.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -14,6 +14,13 @@ Patch0: gsd-calculator.patch
 # http://git.gnome.org/browse/gnome-settings-daemon/commit/?id=fedb2be311b69c9dd12ada94047c82a28e73df47
 Patch1: gsd-wacom.patch
 
+# Fedora specific, don't automatically install security updates
+# as the user can still restart and make the rpmdb crazy.
+#
+# Fixing this properly involves some new functionality in systemd,
+# which won't be showing up until F18.
+Patch2: gsd-auto-update-type-is-none.patch
+
 Requires: control-center-filesystem
 
 BuildRequires:  dbus-glib-devel
@@ -66,6 +73,7 @@ developing applications that use %{name}.
 %setup -q
 %patch0 -p1 -b .calc
 %patch1 -p1 -b .wacom
+%patch2 -p1 -b .update-none
 
 autoreconf -i -f
 
@@ -215,6 +223,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh
 
 %changelog
+* Tue May 08 2012 Richard Hughes <rhughes at redhat.com> - 3.4.1-4
+- Do not install security updates automatically
+- Resolves #755335
+
 * Tue Apr 24 2012 Dan Horák <dan[at]danny.cz> - 3.4.1-3
 - add upstream patch that disables wacom support on s390(x)
 
diff --git a/gsd-auto-update-type-is-none.patch b/gsd-auto-update-type-is-none.patch
new file mode 100644
index 0000000..d710345
--- /dev/null
+++ b/gsd-auto-update-type-is-none.patch
@@ -0,0 +1,13 @@
+diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+index c09096a..ef53b1c 100644
+--- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
+@@ -31,7 +31,7 @@
+       <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and also WiFi if 'connection-use-wifi' is enabled and mobile broadband if 'connection-use-mobile' is enabled.</_description>
+     </key>
+     <key name="auto-update-type" enum="org.gnome.settings-daemon.GsdUpdateType">
+-      <default>'security'</default>
++      <default>'none'</default>
+       <_summary>Automatically install these types of updates</_summary>
+       <_description>Automatically install these types of updates.</_description>
+     </key>