[cinnamon-screensaver] disable console-kit in configure
leigh123linux
leigh123linux at fedoraproject.org
Sun Jul 28 11:57:55 UTC 2013
commit dc283d401a802eb147f550ae5c5e3c4fb036352f
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Sun Jul 28 12:57:42 2013 +0100
disable console-kit in configure
- add systemd patch
cinnamon-screensaver.spec | 10 ++++++++--
systemd.patch | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+), 2 deletions(-)
---
diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec
index df92b10..da2e99a 100644
--- a/cinnamon-screensaver.spec
+++ b/cinnamon-screensaver.spec
@@ -8,7 +8,7 @@
Summary: Cinnamon Screensaver
Name: cinnamon-screensaver
Version: 1.8.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://cinnamon.linuxmint.com
@@ -17,6 +17,7 @@ URL: http://cinnamon.linuxmint.com
Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%{name}-%{version}.tar.gz
Patch0: cinnamon-screensaver-2.20.0-selinux-permit.patch
+Patch1: systemd.patch
BuildRequires: gtk3-devel => %{gtk3_version}
@@ -53,13 +54,14 @@ cinnamon-screensaver is a screen saver and locker.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am
echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac
NOCONFIGURE=1 ./autogen.sh
%build
-%configure --with-mit-ext=no
+%configure --with-mit-ext=no --without-console-kit
make V=1 %{?_smp_mflags}
%install
@@ -86,6 +88,10 @@ desktop-file-install \
%doc %{_mandir}/man1/*.1.gz
%changelog
+* Sun Jul 28 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.0-4
+- disable console-kit in configure
+- add systemd patch
+
* Mon Jul 22 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.0-3
- fix prep warnings
diff --git a/systemd.patch b/systemd.patch
new file mode 100644
index 0000000..3116490
--- /dev/null
+++ b/systemd.patch
@@ -0,0 +1,39 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -606,7 +606,7 @@ AC_ARG_WITH(systemd,
+ [with_systemd=$withval], [with_systemd=auto])
+
+ PKG_CHECK_MODULES(SYSTEMD,
+- [libsystemd-login libsystemd-daemon],
++ [libsystemd-login],
+ [have_systemd=yes], [have_systemd=no])
+
+ if test "x$with_systemd" = "xauto" ; then
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <string.h>
++#include <unistd.h>
+
+ #include <glib/gi18n.h>
+
+@@ -33,7 +34,6 @@
+ #include <dbus/dbus-glib-lowlevel.h>
+
+ #ifdef WITH_SYSTEMD
+-#include <systemd/sd-daemon.h>
+ #include <systemd/sd-login.h>
+ #endif
+
+@@ -1518,7 +1518,8 @@ gs_listener_init (GSListener *listener)
+ listener->priv = GS_LISTENER_GET_PRIVATE (listener);
+
+ #ifdef WITH_SYSTEMD
+- listener->priv->have_systemd = sd_booted () > 0;
++ /* check if logind is running */
++ listener->priv->have_systemd = (access("/run/systemd/seats/", F_OK) >= 0);
+ #endif
+
+ gs_listener_dbus_init (listener);
More information about the scm-commits
mailing list