diff --git a/systemd-dynamic-check.diff b/systemd-dynamic-check.diff deleted file mode 100644 index 538d152..0000000 --- a/systemd-dynamic-check.diff +++ /dev/null @@ -1,49 +0,0 @@ -commit ce5a67127223e99ffdbf9cb697537c689e2fe364 -Author: Vincent Untz -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 . - - 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 - #include - #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; diff --git a/udisks-1.99.0.tar.bz2 b/udisks-1.99.0.tar.bz2 deleted file mode 100644 index 4d2bd4d..0000000 --- a/udisks-1.99.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f06d1947ac3c79f3de85ee17b7046da9d22dd9ab06cc75a985e767161704e176 -size 729253 diff --git a/udisks-2.0.0.tar.bz2 b/udisks-2.0.0.tar.bz2 new file mode 100644 index 0000000..260f200 --- /dev/null +++ b/udisks-2.0.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa026a5a865688a2e9e430a389c7636c1a556d980539e4bd4a3f31dc5d4fe1eb +size 747405 diff --git a/udisks2.changes b/udisks2.changes index 8691f18..ce6fcc6 100644 --- a/udisks2.changes +++ b/udisks2.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Mon Nov 12 22:22:01 UTC 2012 - hrvoje.senjan@gmail.com + +- Update to version 2.0.0 + + configure.ac: raise gudev dependency + + Add --disable-man configure option + + Update list of recovery/system partitions + + Add support for creating exFAT filesystems and changing exFAT + labels + + Add textual descriptions for IMSM Raid members + + Use all-caps for RAID + + Only do the isohybrid hack for the first partition + + Don't complain about missing /etc/crypttab file + + Don't complain about missing /etc/fstab file + + Make it work without requiring the kernel to be CONFIG_SWAP=y + + Mention the right file when complaing about /proc/swaps + + Fix glaringly wrong documentation for Filesystem.Mount() + + Move bash completion script into + /usr/share/bash-completion/completions + + Don't require that users define UDISKS_API_IS_SUBJECT_TO_CHANGE + + Remove udisks_daemon_util_on_other_seat() from sections.txt + + Update translations from Transifex + + Add workaround annotation for + udisks_client_get_block_for_dev() + + Enable large file support + + Various doc and tests fixes + + Bugs fixed: + - fdo#51063: Mount vfat with "flush" option +- Drop systemd-dynamic-check.diff: fixed upstream. +- Dropped gnome-common BuildRequires and call to gnome-autogen.sh, as + patch which needed that is dropped. + ------------------------------------------------------------------- Wed Oct 24 12:16:42 UTC 2012 - meissner@suse.com diff --git a/udisks2.spec b/udisks2.spec index 8ee94d9..efd388f 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -20,19 +20,15 @@ Name: udisks2 %define _name udisks -Version: 1.99.0 +Version: 2.0.0 Release: 0 Summary: Disk Management Service, version 2 License: GPL-2.0+ Group: System/Daemons Url: http://www.freedesktop.org/wiki/Software/udisks Source: http://udisks.freedesktop.org/releases/%{_name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM systemd-dynamic-check.diff fdo#55309 bnc#769570 tiwai@suse.de -- 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 @@ -95,12 +91,9 @@ for managing disks and storage devices. %lang_package %prep %setup -q -n %{_name}-%{version} -%patch1 -p1 %build export V=1 -# needed for patch1 -NOCONFIGURE=1 gnome-autogen.sh %configure \ --disable-static make %{?_smp_mflags} @@ -135,7 +128,7 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print %{_bindir}/udisksctl %dir %{_libexecdir}/udisks2 %{_libexecdir}/udisks2/udisksd -%{_sysconfdir}/bash_completion.d/udisksctl-bash-completion.sh +%{_datadir}/bash-completion/completions/udisksctl %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf %{_datadir}/dbus-1/system-services/org.freedesktop.UDisks2.service %{_datadir}/polkit-1/actions/org.freedesktop.udisks2.policy