Update to release 1.96.0

This commit is contained in:
David Zeuthen 2012-04-30 15:24:52 -04:00
parent f45035adda
commit 8fca9979cc
4 changed files with 7 additions and 47 deletions

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/udisks-1.93.0.tar.bz2
/udisks-1.94.0.tar.bz2
/udisks-1.95.0.tar.bz2
/udisks-1.96.0.tar.bz2

View File

@ -1 +1 @@
d7a6945f756f8a9aa3bbd37459b13636 udisks-1.95.0.tar.bz2
427a31f0d9056af79e44f0278844c8b9 udisks-1.96.0.tar.bz2

View File

@ -1,33 +0,0 @@
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

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