Accepting request 81432 from home:vuntz:branches:GNOME:Factory

Disable some patches we're not sure about

OBS-URL: https://build.opensuse.org/request/show/81432
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-settings-daemon?expand=0&rev=103

gnome-settings-daemon.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Sep  8 06:59:13 UTC 2011 - vuntz@opensuse.org
+
+- Disable gnome-settings-daemon-system-proxy-configuration.diff for
+  now: we really need to fix it the proper way, which likely
+  involves libproxy, as mentioned in
+  http://code.google.com/p/libproxy/issues/detail?id=165 (tracked
+  in bnc#690493).
+- Also note that gnome-packagekit-fate302445.patch is not enabled
+  right now (tracked in bnc#689592).
+
 -------------------------------------------------------------------
 Mon Sep  5 15:51:46 UTC 2011 - vuntz@opensuse.org
 
@@ -112,12 +123,14 @@ Thu Aug 18 08:58:07 CEST 2011 - dimstar@opensuse.org
 Fri Jul 29 04:19:01 UTC 2011 - glin@suse.com
 
 - Rebase gnome-settings-daemon-system-proxy-configuration.diff and
-  gnome-settings-daemon-bnc462640-mute-action.patch and enable the
+  gnome-settings-daemon-bnc462640-mute-action.patch, and re-enable
-  the call to autoreconf.
+  the the call to autoreconf.
 - Add gnome-settings-daemon-stop-reload-proxy-settings.patch to
-  stop the g-s-d packagekit plugin, to pop up the authentication
+  stop the g-s-d packagekit plugin from popping up an
-  for reloading the proxy settings (bnc#689592#c1 for bnc#538353)
+  authentication window when reloading the proxy settings
-- Rebase gnome-packagekit-fate302445.patch and migrate to gsettings
+  (bnc#689592#c1 for bnc#538353)
+- Port gnome-packagekit-fate302445.patch to gnome-settings-daemon
+  and GSettings.
 
 -------------------------------------------------------------------
 Mon Jul 25 12:54:49 CEST 2011 - vuntz@opensuse.org

gnome-settings-daemon.spec

@@ -25,7 +25,7 @@ Summary:        Settings daemon for the GNOME desktop
 Url:            http://www.gnome.org
 Group:          System/GUI/GNOME
 Source:         http://download.gnome.org/sources/gnome-settings-daemon/3.1/%{name}-%{version}.tar.bz2
-# PATCH-FEATURE-OPENSUSE gnome-settings-daemon-system-proxy-configuration.diff
+# PATCH-NEEDS-REBASE gnome-settings-daemon-system-proxy-configuration.diff
 Patch2:         gnome-settings-daemon-system-proxy-configuration.diff
 # PATCH-NEEDS-REBASE gnome-settings-daemon-apport-monitor.patch bnc439203 jblunck@novell.com -- Add apport monitoring plugin. (was PATCH-FEATURE-UPSTREAM)
 Patch8:         gnome-settings-daemon-apport-monitor.patch
@@ -129,17 +129,17 @@ translation-update-upstream
 %if !0%{?BUILD_FROM_VCS}
 # Disabled because of the non-rebased patches
 #gnome-patch-translation-prepare
-%patch2 -p0
+#%%patch2 -p0
-#%patch8 -p0
+#%%patch8 -p0
 %patch10 -p0
 # PATCH-NEEDS-REBASE
-#%patch11 -p1
+#%%patch11 -p1
 # PATCH-NEEDS-REBASE
-#%patch13 -p0
+#%%patch13 -p0
 # PATCH-NEEDS-REBASE
-#%patch14 -p0
+#%%patch14 -p0
 # PATCH-NEEDS-REBASE
-#%patch15 -p0
+#%%patch15 -p0
 %patch16 -p1
 %patch17 -p1
 %endif
@@ -192,7 +192,8 @@ rm -rf %{buildroot}
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-backlight-helper
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-locate-pointer
 %{_libexecdir}/gnome-settings-daemon-3.0/gsd-printer
-%{_libexecdir}/gnome-settings-daemon-3.0/novell-sysconfig-proxy-helper
+# From patch2
+#%{_libexecdir}/gnome-settings-daemon-3.0/novell-sysconfig-proxy-helper
 %if "%{_libdir}" != "%{_libexecdir}"
 %dir %{_libdir}/gnome-settings-daemon-3.0/
 %endif
@@ -210,7 +211,8 @@ rm -rf %{buildroot}
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.orientation.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.print-notifications.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.proxy.gschema.xml
+# From patch2
+#%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.proxy.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.updates.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xrandr.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml