[lightdm] lightdm-1.5.1 (#919543)

[Rex Dieter]

commit 50d43154d3d53abc5e6b00003854428fcbfcd4df
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Mar 9 11:40:14 2013 -0600

    lightdm-1.5.1 (#919543)

 .gitignore                                         |    2 +-
 ...tch => lightdm-1.5.1-systemd_login1_power.patch |   20 +++++++++++---------
 lightdm.spec                                       |   10 +++++++---
 sources                                            |    2 +-
 4 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c58af83..10ce48e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /lightdm-1.4.0.tar.gz
-/lightdm-1.5.0.tar.xz
+/lightdm-1.5.1.tar.xz
diff --git a/lightdm-1.5.0-systemd_login1_power.patch b/lightdm-1.5.1-systemd_login1_power.patch
similarity index 90%
rename from lightdm-1.5.0-systemd_login1_power.patch
rename to lightdm-1.5.1-systemd_login1_power.patch
index e8bbf66..0bcb245 100644
--- a/lightdm-1.5.0-systemd_login1_power.patch
+++ b/lightdm-1.5.1-systemd_login1_power.patch
@@ -1,6 +1,6 @@
-diff -up lightdm-1.5.0/liblightdm-gobject/power.c.systemd_login1_power lightdm-1.5.0/liblightdm-gobject/power.c
---- lightdm-1.5.0/liblightdm-gobject/power.c.systemd_login1_power	2013-01-31 14:50:09.000000000 -0600
-+++ lightdm-1.5.0/liblightdm-gobject/power.c	2013-01-31 15:24:48.907375383 -0600
+diff -up lightdm-1.5.1/liblightdm-gobject/power.c.systemd_login1_power lightdm-1.5.1/liblightdm-gobject/power.c
+--- lightdm-1.5.1/liblightdm-gobject/power.c.systemd_login1_power	2013-03-05 20:40:10.000000000 -0600
++++ lightdm-1.5.1/liblightdm-gobject/power.c	2013-03-09 11:31:00.169897568 -0600
 @@ -17,6 +17,7 @@
  
  static GDBusProxy *upower_proxy = NULL;
@@ -119,9 +119,9 @@ diff -up lightdm-1.5.0/liblightdm-gobject/power.c.systemd_login1_power lightdm-1
 +          function_result = ck_call_function ("Stop", TRUE, error);
 +    return function_result;
  }
-diff -up lightdm-1.5.0/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.5.0/liblightdm-qt/power.cpp
---- lightdm-1.5.0/liblightdm-qt/power.cpp.systemd_login1_power	2013-01-31 14:55:46.000000000 -0600
-+++ lightdm-1.5.0/liblightdm-qt/power.cpp	2013-01-31 15:24:48.908375371 -0600
+diff -up lightdm-1.5.1/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.5.1/liblightdm-qt/power.cpp
+--- lightdm-1.5.1/liblightdm-qt/power.cpp.systemd_login1_power	2013-03-05 20:40:10.000000000 -0600
++++ lightdm-1.5.1/liblightdm-qt/power.cpp	2013-03-09 11:36:47.140559838 -0600
 @@ -15,6 +15,7 @@
  #include <QtCore/QVariant>
  #include <QtDBus/QDBusInterface>
@@ -145,10 +145,11 @@ diff -up lightdm-1.5.0/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.5.
  {
  }
  
-@@ -80,34 +83,53 @@ void PowerInterface::hibernate()
+@@ -80,34 +83,55 @@ void PowerInterface::hibernate()
  
  bool PowerInterface::canShutdown()
  {
++
 +    if ( d->login1Interface->isValid() ) {
 +      QDBusReply<QString> reply1 = d->login1Interface->call("CanPowerOff");
 +      if (reply1.isValid()) {
@@ -164,6 +165,7 @@ diff -up lightdm-1.5.0/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.5.
 -    else {
 -        return false;
 -    }
++
 +    return false;
  }
  
@@ -185,7 +187,7 @@ diff -up lightdm-1.5.0/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.5.
 +      }
 +    }
 +    qWarning() << d->login1Interface->lastError();
-+  
++
      QDBusReply<bool> reply = d->consoleKitInterface->call("CanRestart");
      if (reply.isValid()) {
          return reply.value();
@@ -206,4 +208,4 @@ diff -up lightdm-1.5.0/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.5.
 +        d->consoleKitInterface->call("Restart");
  }
  
- #include "power_moc.cpp"
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
diff --git a/lightdm.spec b/lightdm.spec
index 47a2c66..f50e257 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -5,8 +5,8 @@
 
 Name:    lightdm
 Summary: Lightweight Display Manager
-Version: 1.5.0
-Release: 3%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
 
 # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
 License: (LGPLv2 or LGPLv3) and GPLv3+
@@ -29,7 +29,7 @@ Patch11: lightdm-1.2.2-nodaemon_option.patch
 
 ## upstreamable patches
 # initial support for org.freedesktop.login1 powerOff/Reboot actions
-Patch50: lightdm-1.5.0-systemd_login1_power.patch
+Patch50: lightdm-1.5.1-systemd_login1_power.patch
 
 BuildRequires: gettext
 BuildRequires: gnome-common
@@ -144,6 +144,7 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
 %configure \
   --disable-static \
   --enable-gtk-doc \
+  --enable-liblightdm-qt --disable-liblightdm-qt5 \
   --enable-introspection \
   --with-greeter-user=lightdm \
   --with-greeter-session=lightdm-greeter
@@ -261,6 +262,9 @@ exit 0
 
 
 %changelog
+* Sat Mar 09 2013 Rex Dieter <rdieter at fedoraproject.org> 1.5.1-1
+- lightdm-1.5.1 (#919543)
+
 * Fri Feb 22 2013 Rex Dieter <rdieter at fedoraproject.org> 1.5.0-3
 - drop Requires: ConsoleKit (f18+)
 
diff --git a/sources b/sources
index 0f99b55..8847447 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e063b73aef31563b4e463a5bbb31b0fc  lightdm-1.5.0.tar.xz
+e1b24757fdbd498af9e4af253f112754  lightdm-1.5.1.tar.xz