From 1f8040378ccdc5a93be5d7a209cca16f32f5215b63ed043e774fd843d680d563 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 6 Apr 2012 15:24:40 +0000 Subject: [PATCH 1/2] Accepting request 112254 from home:javihernandez:gnome3.4 - Enable systemd only for openSUSE >= 12.2 OBS-URL: https://build.opensuse.org/request/show/112254 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=147 --- gnome-session.changes | 5 +++++ gnome-session.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/gnome-session.changes b/gnome-session.changes index fdfc4c3..1c7339f 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 2 16:25:06 UTC 2012 - jhernandez@emergya.es + +- Enable systemd only for openSUSE >= 12.2 + ------------------------------------------------------------------- Tue Mar 27 08:55:41 UTC 2012 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index ee90616..87e073c 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -51,8 +51,10 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(json-glib-1.0) >= 0.10 +%if 0%{?suse_version} >= 1220 BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-login) +%endif BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(upower-glib) @@ -141,6 +143,7 @@ translation-update-upstream %build NOCONFIGURE=1 gnome-autogen.sh %configure + %__make %{?jobs:-j%jobs} V=1 %install From fd52ebe8fa7977738c704b1377448c4cb64b15f13b1651463c48e11c86d18c03 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 6 Apr 2012 15:27:22 +0000 Subject: [PATCH 2/2] Accepting request 112875 from home:vuntz:branches:GNOME:Factory cleanup OBS-URL: https://build.opensuse.org/request/show/112875 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=148 --- gnome-session.changes | 4 +++- gnome-session.spec | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnome-session.changes b/gnome-session.changes index 1c7339f..8d9fbbe 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- Mon Apr 2 16:25:06 UTC 2012 - jhernandez@emergya.es -- Enable systemd only for openSUSE >= 12.2 +- Enable systemd support only for openSUSE >= 12.2. On earlier + versions, don't use libsystemd-daemon/libsystemd-login + pkgconfig() BuildRequires since systemd is too old there. ------------------------------------------------------------------- Tue Mar 27 08:55:41 UTC 2012 - vuntz@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index 87e073c..a87cd23 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -143,7 +143,6 @@ translation-update-upstream %build NOCONFIGURE=1 gnome-autogen.sh %configure - %__make %{?jobs:-j%jobs} V=1 %install