Make daemon actually link with libsystemd-login

This commit is contained in:
David Zeuthen 2012-04-30 15:01:49 -04:00
parent 5a1906f409
commit 4b00847924
2 changed files with 47 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From bf5c9b55052c15936ed7c83f06089b6655ef635d Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@redhat.com>
Date: Mon, 30 Apr 2012 14:53:59 -0400
Subject: [PATCH] Actually link with libsystemd-login
Signed-off-by: David Zeuthen <davidz@redhat.com>
---
src/Makefile.am | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Makefile.am b/src/Makefile.am
index a3a5787..723a29f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,6 +87,7 @@ libudisks_daemon_la_CFLAGS = \
$(LIBATASMART_CFLAGS) \
$(POLKIT_GOBJECT_1_CFLAGS) \
$(ACL_CFLAGS) \
+ $(LIBSYSTEMD_LOGIN_CFLAGS) \
$(NULL)
libudisks_daemon_la_LIBADD = \
@@ -96,6 +97,7 @@ libudisks_daemon_la_LIBADD = \
$(LIBATASMART_LIBS) \
$(POLKIT_GOBJECT_1_LIBS) \
$(ACL_LIBS) \
+ $(LIBSYSTEMD_LOGIN_LIBS) \
$(top_builddir)/udisks/libudisks2.la \
$(NULL)
--
1.7.10

View File

@ -8,7 +8,7 @@
Summary: Disk Manager Summary: Disk Manager
Name: udisks2 Name: udisks2
Version: 1.95.0 Version: 1.95.0
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.freedesktop.org/wiki/Software/udisks URL: http://www.freedesktop.org/wiki/Software/udisks
@ -55,6 +55,14 @@ Requires: ntfsprogs
# for /proc/self/mountinfo, only available in 2.6.26 or higher # for /proc/self/mountinfo, only available in 2.6.26 or higher
Conflicts: kernel < 2.6.26 Conflicts: kernel < 2.6.26
# this patch needs autoreconf
Patch0: udisks-1.95.0-actually-link-with-libsystemd-login.patch
BuildRequires: libtool
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: intltool
BuildRequires: pkgconfig
%description %description
udisks provides a daemon, D-Bus API and command line tools for 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 managing disks and storage devices. This package is for the udisks 2.x
@ -84,8 +92,10 @@ daemon. This package is for the udisks 2.x series.
%prep %prep
%setup -q -n udisks-%{version} %setup -q -n udisks-%{version}
%patch0 -p1
%build %build
autoreconf
%configure --enable-gtk-doc %configure --enable-gtk-doc
make make
@ -141,6 +151,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
# Note: please don't forget the %{?dist} in the changelog. Thanks # Note: please don't forget the %{?dist} in the changelog. Thanks
%changelog %changelog
* Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.95.0-2%{?dist}
- Make daemon actually link with libsystemd-login
* Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.95.0-1%{?dist} * Mon Apr 30 2012 David Zeuthen <davidz@redhat.com> - 1.95.0-1%{?dist}
- Update to release 1.95.0 - Update to release 1.95.0