diff --git a/.gitignore b/.gitignore index 592c817..a9dc1ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /udisks-1.90.0.git20111128.tar.bz2 /udisks-1.90.0.tar.bz2 +/udisks-1.91.0.tar.bz2 diff --git a/0001-Ensure-PATH-is-set.patch b/0001-Ensure-PATH-is-set.patch deleted file mode 100644 index db9647c..0000000 --- a/0001-Ensure-PATH-is-set.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d31b65e8f1ff1860aef79317ba270d7d2cefb041 Mon Sep 17 00:00:00 2001 -From: David Zeuthen -Date: Sat, 21 Jan 2012 16:26:46 -0500 -Subject: [PATCH] Ensure PATH is set - -Apparently PATH may be empty if activated by recent D-Bus daemons. - -Signed-off-by: David Zeuthen ---- - src/main.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/main.c b/src/main.c -index a330a58..0039fe8 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -140,6 +140,9 @@ main (int argc, - } - } - -+ if (g_getenv ("PATH") == NULL) -+ g_setenv ("PATH", "/usr/bin:/bin:/usr/sbin:/sbin", TRUE); -+ - udisks_notice ("udisks daemon version %s starting", PACKAGE_VERSION); - - loop = g_main_loop_new (NULL, FALSE); --- -1.7.7.5 - diff --git a/sources b/sources index 9dcbf51..2cd8957 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -187e07875eebcb2046cea763561b8a44 udisks-1.90.0.tar.bz2 +c8ed6a9be8cd6eafba747121c8cb0d87 udisks-1.91.0.tar.bz2 diff --git a/udisks2.spec b/udisks2.spec index ef0e336..40d37c1 100644 --- a/udisks2.spec +++ b/udisks2.spec @@ -1,4 +1,4 @@ -%define glib2_version 2.31.0 +%define glib2_version 2.31.13 %define gobject_introspection_version 1.30.0 %define polkit_version 0.101 %define udev_version 173 @@ -7,8 +7,8 @@ Summary: Disk Manager Name: udisks2 -Version: 1.90.0 -Release: 3%{?dist} +Version: 1.91.0 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.freedesktop.org/wiki/Software/udisks @@ -20,6 +20,7 @@ BuildRequires: intltool BuildRequires: libatasmart-devel >= %{libatasmart_version} BuildRequires: libgudev1-devel >= %{udev_version} BuildRequires: gtk-doc +BuildRequires: systemd-devel # needed to pull in the system bus daemon Requires: dbus >= %{dbus_version} # needed to pull in the udev daemon @@ -49,8 +50,6 @@ Requires: cryptsetup-luks # for /proc/self/mountinfo, only available in 2.6.26 or higher Conflicts: kernel < 2.6.26 -Patch0: 0001-Ensure-PATH-is-set.patch - %description udisks provides a daemon, D-Bus API and command line tools for managing disks and storage devices. This package is for the udisks 2.x @@ -80,7 +79,6 @@ daemon. This package is for the udisks 2.x series. %prep %setup -q -n udisks-%{version} -%patch0 -p1 %build %configure --enable-gtk-doc @@ -92,15 +90,18 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a +%find_lang %{name} + %post -n libudisks2 -p /sbin/ldconfig %postun -n libudisks2 -p /sbin/ldconfig -%files +%files -f %{name}.lang %doc README AUTHORS NEWS COPYING HACKING %{_sysconfdir}/dbus-1/system.d/org.freedesktop.UDisks2.conf %{_sysconfdir}/bash_completion.d/udisksctl-bash-completion.sh +/usr/lib/systemd/system/udisks2.service /lib/udev/rules.d/80-udisks2.rules /sbin/umount.udisks2 @@ -135,6 +136,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a # Note: please don't forget the %{?dist} in the changelog. Thanks %changelog +* Mon Feb 06 2012 David Zeuthen - 1.91.0-1%{?dist} +- Update to release 1.91.0 + * Fri Jan 21 2012 David Zeuthen - 1.90.0-3%{?dist} - Manually set PATH, if not set