[gdm] fix build

Ray Strode rstrode at fedoraproject.org
Thu Jun 16 16:56:43 UTC 2011


commit a6fb1049588f9b3854e69e5b4a23a8568a35e9f2
Author: Ray Strode <rstrode at redhat.com>
Date:   Thu Jun 16 12:56:27 2011 -0400

    fix build

 fix-build.patch |   27 +++++++++++++++++++++++++++
 gdm.spec        |    6 ++++--
 2 files changed, 31 insertions(+), 2 deletions(-)
---
diff --git a/fix-build.patch b/fix-build.patch
new file mode 100644
index 0000000..fb67040
--- /dev/null
+++ b/fix-build.patch
@@ -0,0 +1,27 @@
+From b7d107a0156f3c7e07524175d9d27e2d868b58ff Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Thu, 16 Jun 2011 12:33:01 -0400
+Subject: [PATCH] dconf: make show-actions lock down optional
+
+The key is no longer necessary in recent versions of
+gnome-power-manager.
+---
+ data/make-dconf-override-db.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/data/make-dconf-override-db.sh b/data/make-dconf-override-db.sh
+index ca04852..252f6ef 100755
+--- a/data/make-dconf-override-db.sh
++++ b/data/make-dconf-override-db.sh
+@@ -11,7 +11,7 @@ eval `dbus-launch --sh-syntax`
+ 
+ trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
+ 
+-gsettings set org.gnome.power-manager show-actions false
++gsettings set org.gnome.power-manager show-actions false || :
+ 
+ gsettings set org.gnome.desktop.a11y.keyboard enable true
+ gsettings set org.gnome.desktop.background show-desktop-icons false
+-- 
+1.7.5.1
+
diff --git a/gdm.spec b/gdm.spec
index a2c4f7a..527f08f 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -97,9 +97,10 @@ Requires: audit-libs >= %{libauditver}
 # how well this will work with generic logos, though
 Requires: system-icon-theme
 
-Patch2: plymouth.patch
+Patch0: fix-build.patch
 
 # Fedora-specific
+Patch98: plymouth.patch
 Patch99: gdm-3.0.0-fedora-logo.patch
 
 %package plugin-smartcard
@@ -126,7 +127,8 @@ The GDM fingerprint plugin provides functionality necessary to use a fingerprint
 
 %prep
 %setup -q
-%patch2 -p1 -b .plymouth
+%patch0 -p1 -b .fix-build
+%patch98 -p1 -b .plymouth
 %patch99 -p1 -b .fedora-logo
 
 autoreconf -i -f


More information about the scm-commits mailing list