Hello community, here is the log from the commit of package udisks2 for openSUSE:Factory checked in at 2012-10-07 20:05:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/udisks2 (Old) and /work/SRC/openSUSE:Factory/.udisks2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "udisks2", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/udisks2/udisks2.changes 2012-06-28 17:07:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.udisks2.new/udisks2.changes 2012-10-07 20:08:01.000000000 +0200 @@ -1,0 +2,13 @@ +Tue Sep 25 09:14:34 UTC 2012 - [email protected] + +- Update systemd-dynamic-check.diff with patch sent upstream. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, as + needed by the patch now. + +------------------------------------------------------------------- +Tue Jul 3 15:39:33 CEST 2012 - [email protected] + +- Add systemd-dynamic-check.diff: add a check of running systemd + (bnc#769570) + +------------------------------------------------------------------- New: ---- systemd-dynamic-check.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ udisks2.spec ++++++ --- /var/tmp/diff_new_pack.SSVIPL/_old 2012-10-07 20:08:01.000000000 +0200 +++ /var/tmp/diff_new_pack.SSVIPL/_new 2012-10-07 20:08:01.000000000 +0200 @@ -27,8 +27,12 @@ Source: http://udisks.freedesktop.org/releases/%{_name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM udisks-hide-lvm-raid-partitions.patch fdo#51439 bnc#737038 [email protected] -- Hide partitions marked as containing LVM and RAID. This is only useful for encrypted partitions. Patch0: udisks-hide-lvm-raid-partitions.patch +# PATCH-FIX-UPSTREAM systemd-dynamic-check.diff fdo#55309 bnc#769570 [email protected] -- Add a check of running systemd so that it still works with sysvinit +Patch1: systemd-dynamic-check.diff # Needed to build the man pages BuildRequires: docbook-xsl-stylesheets +# needed for patch1 +BuildRequires: gnome-common BuildRequires: gobject-introspection-devel BuildRequires: intltool BuildRequires: libacl-devel @@ -92,9 +96,12 @@ %prep %setup -q -n %{_name}-%{version} %patch0 -p1 +%patch1 -p1 %build export V=1 +# needed for patch1 +NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static make %{?_smp_mflags} ++++++ systemd-dynamic-check.diff ++++++ commit ce5a67127223e99ffdbf9cb697537c689e2fe364 Author: Vincent Untz <[email protected]> Date: Tue Sep 25 10:55:31 2012 +0200 Fix same seat detection if built with systemd, but not booted with it If we haven't booted with systemd, then we can only assume it's always the same seat. Based on patch by Takashi Iwai <[email protected]>. https://bugzilla.novell.com/show_bug.cgi?id=769570 diff --git a/configure.ac b/configure.ac index 994fd1a..93c715e 100644 --- a/configure.ac +++ b/configure.ac @@ -145,7 +145,7 @@ AC_SUBST(LIBATASMART_CFLAGS) AC_SUBST(LIBATASMART_LIBS) PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, - [libsystemd-login >= 44], + [libsystemd-login >= 44 libsystemd-daemon], have_libsystemd_login=yes, have_libsystemd_login=no) AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes) diff --git a/src/udisksdaemonutil.c b/src/udisksdaemonutil.c index ef925f5..69cd8a5 100644 --- a/src/udisksdaemonutil.c +++ b/src/udisksdaemonutil.c @@ -42,6 +42,7 @@ #include "udiskslinuxdriveobject.h" #if defined(HAVE_LIBSYSTEMD_LOGIN) +#include <systemd/sd-daemon.h> #include <systemd/sd-login.h> #endif @@ -1021,6 +1022,10 @@ udisks_daemon_util_on_same_seat (UDisksDaemon *daemon, UDisksObject *drive_object = NULL; UDisksDrive *drive = NULL; + /* if we haven't booted with systemd, assume it's always the same seat */ + if (sd_booted () <= 0) + return TRUE; + if (UDISKS_IS_LINUX_BLOCK_OBJECT (object)) { UDisksLinuxBlockObject *linux_block_object; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
