[lightdm] 1.5.0-1
Rex Dieter
rdieter at fedoraproject.org
Thu Jan 31 21:36:45 UTC 2013
commit b0a3ae74daec3fc3731d95eac788b73f527be752
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Thu Jan 31 15:36:43 2013 -0600
1.5.0-1
- lightdm-1.5.0
- License: (LGPLv2 or LGPLv3) and GPLv3+
.gitignore | 2 +-
...tch => lightdm-1.5.0-systemd_login1_power.patch | 30 ++++++++++----------
lightdm.spec | 27 ++++++++++-------
sources | 2 +-
4 files changed, 33 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cfd3712..c58af83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/lightdm-1.3.3.tar.gz
/lightdm-1.4.0.tar.gz
+/lightdm-1.5.0.tar.xz
diff --git a/lightdm-1.4.0-systemd_login1_power.patch b/lightdm-1.5.0-systemd_login1_power.patch
similarity index 86%
rename from lightdm-1.4.0-systemd_login1_power.patch
rename to lightdm-1.5.0-systemd_login1_power.patch
index 268a70e..e8bbf66 100644
--- a/lightdm-1.4.0-systemd_login1_power.patch
+++ b/lightdm-1.5.0-systemd_login1_power.patch
@@ -1,7 +1,7 @@
-diff -up lightdm-1.4.0/liblightdm-gobject/power.c.systemd_login1_power lightdm-1.4.0/liblightdm-gobject/power.c
---- lightdm-1.4.0/liblightdm-gobject/power.c.systemd_login1_power 2011-12-08 19:51:23.000000000 -0600
-+++ lightdm-1.4.0/liblightdm-gobject/power.c 2013-01-10 22:34:41.782151231 -0600
-@@ -18,6 +18,7 @@
+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
+@@ -17,6 +17,7 @@
static GDBusProxy *upower_proxy = NULL;
static GDBusProxy *ck_proxy = NULL;
@@ -9,7 +9,7 @@ diff -up lightdm-1.4.0/liblightdm-gobject/power.c.systemd_login1_power lightdm-1
static gboolean
upower_call_function (const gchar *function, gboolean default_result, GError **error)
-@@ -148,6 +149,59 @@ ck_call_function (const gchar *function,
+@@ -147,6 +148,59 @@ ck_call_function (const gchar *function,
return function_result;
}
@@ -69,7 +69,7 @@ diff -up lightdm-1.4.0/liblightdm-gobject/power.c.systemd_login1_power lightdm-1
/**
* lightdm_get_can_restart:
*
-@@ -158,7 +212,11 @@ ck_call_function (const gchar *function,
+@@ -157,7 +211,11 @@ ck_call_function (const gchar *function,
gboolean
lightdm_get_can_restart (void)
{
@@ -82,7 +82,7 @@ diff -up lightdm-1.4.0/liblightdm-gobject/power.c.systemd_login1_power lightdm-1
}
/**
-@@ -172,7 +230,11 @@ lightdm_get_can_restart (void)
+@@ -171,7 +229,11 @@ lightdm_get_can_restart (void)
gboolean
lightdm_restart (GError **error)
{
@@ -95,7 +95,7 @@ diff -up lightdm-1.4.0/liblightdm-gobject/power.c.systemd_login1_power lightdm-1
}
/**
-@@ -185,7 +247,11 @@ lightdm_restart (GError **error)
+@@ -184,7 +246,11 @@ lightdm_restart (GError **error)
gboolean
lightdm_get_can_shutdown (void)
{
@@ -108,7 +108,7 @@ diff -up lightdm-1.4.0/liblightdm-gobject/power.c.systemd_login1_power lightdm-1
}
/**
-@@ -199,5 +265,9 @@ lightdm_get_can_shutdown (void)
+@@ -198,5 +264,9 @@ lightdm_get_can_shutdown (void)
gboolean
lightdm_shutdown (GError **error)
{
@@ -119,10 +119,10 @@ diff -up lightdm-1.4.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.4.0/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.4.0/liblightdm-qt/power.cpp
---- lightdm-1.4.0/liblightdm-qt/power.cpp.systemd_login1_power 2011-12-08 19:51:23.000000000 -0600
-+++ lightdm-1.4.0/liblightdm-qt/power.cpp 2013-01-10 22:57:15.458512125 -0600
-@@ -16,6 +16,7 @@
+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
+@@ -15,6 +15,7 @@
#include <QtCore/QVariant>
#include <QtDBus/QDBusInterface>
#include <QtDBus/QDBusReply>
@@ -130,7 +130,7 @@ diff -up lightdm-1.4.0/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.4.
#include "config.h"
-@@ -27,11 +28,13 @@ public:
+@@ -26,11 +27,13 @@ public:
PowerInterfacePrivate();
QScopedPointer<QDBusInterface> powerManagementInterface;
QScopedPointer<QDBusInterface> consoleKitInterface;
@@ -145,7 +145,7 @@ diff -up lightdm-1.4.0/liblightdm-qt/power.cpp.systemd_login1_power lightdm-1.4.
{
}
-@@ -81,34 +84,53 @@ void PowerInterface::hibernate()
+@@ -80,34 +83,53 @@ void PowerInterface::hibernate()
bool PowerInterface::canShutdown()
{
diff --git a/lightdm.spec b/lightdm.spec
index 8a3e700..efe008b 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -5,14 +5,15 @@
Name: lightdm
Summary: Lightweight Display Manager
-Version: 1.4.0
-Release: 6%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
-# library/bindings are LGPLv3, the rest GPLv3+
-License: LGPLv3+ and GPLv3+
+# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
+License: (LGPLv2 or LGPLv3) and GPLv3+
#URL: http://www.freedesktop.org/wiki/Software/LightDM
URL: https://launchpad.net/lightdm/
-Source0: https://launchpad.net/lightdm/1.4/%{version}/+download/lightdm-%{version}.tar.gz
+Source0: https://launchpad.net/lightdm/1.6/%{version}/+download/lightdm-%{version}.tar.xz
+
Source1: lightdm.pam
Source2: lightdm-autologin.pam
Source3: lightdm-tmpfiles.conf
@@ -28,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.4.0-systemd_login1_power.patch
+Patch50: lightdm-1.5.0-systemd_login1_power.patch
BuildRequires: gettext
BuildRequires: gnome-common
@@ -202,8 +203,8 @@ exit 0
%endif
%files -f %{name}.lang
-%doc COPYING
-%doc ChangeLog NEWS README
+%doc COPYING.GPL3
+%doc NEWS
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
%config(noreplace) %{_sysconfdir}/pam.d/lightdm*
%dir %{_sysconfdir}/lightdm/
@@ -214,7 +215,7 @@ exit 0
%{_sbindir}/lightdm
%{_libexecdir}/lightdm/
%{_libdir}/girepository-1.0/LightDM-1.typelib
-%{_mandir}/man*/lightdm.*.*
+%{_mandir}/man1/lightdm*
%dir %attr(-,lightdm,lightdm) %{_localstatedir}/cache/lightdm/
%if 0%{?systemd}
%{_unitdir}/lightdm.service
@@ -233,7 +234,7 @@ exit 0
%postun gobject -p /sbin/ldconfig
%files gobject
-# no LGPLv3+ license file included
+%doc COPYING.LGPL2 COPYING.LGPL3
%{_libdir}/liblightdm-gobject-1.so.0*
%files gobject-devel
@@ -248,7 +249,7 @@ exit 0
%postun qt -p /sbin/ldconfig
%files qt
-# no LGPLv3+ license file included
+%doc COPYING.LGPL2 COPYING.LGPL3
%{_libdir}/liblightdm-qt-2.so.0*
%files qt-devel
@@ -258,6 +259,10 @@ exit 0
%changelog
+* Thu Jan 31 2013 Rex Dieter <rdieter at fedoraproject.org> 1.5.0-1
+- lightdm-1.5.0
+- License: (LGPLv2 or LGPLv3) and GPLv3+
+
* Thu Jan 31 2013 Rex Dieter <rdieter at fedoraproject.org> 1.4.0-6
- Requires: polkit-js-engine (f19+)
diff --git a/sources b/sources
index 8545e8d..0f99b55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-622d9087ec773dd0626a250a5868f88c lightdm-1.4.0.tar.gz
+e063b73aef31563b4e463a5bbb31b0fc lightdm-1.5.0.tar.xz
More information about the scm-commits
mailing list