[udisks2] Fix build

David Zeuthen davidz at fedoraproject.org
Thu Feb 23 18:50:17 UTC 2012


commit 1ac4282f3e569997d9e252eaa216edae9828cf85
Author: David Zeuthen <davidz at redhat.com>
Date:   Thu Feb 23 13:49:50 2012 -0500

    Fix build
    
    Signed-off-by: David Zeuthen <davidz at redhat.com>

 0001-Don-t-include-sys-acl.h-it-s-not-needed.patch |   25 ++++++++++++++++++++
 udisks2.spec                                       |    8 +++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-Don-t-include-sys-acl.h-it-s-not-needed.patch b/0001-Don-t-include-sys-acl.h-it-s-not-needed.patch
new file mode 100644
index 0000000..95e495f
--- /dev/null
+++ b/0001-Don-t-include-sys-acl.h-it-s-not-needed.patch
@@ -0,0 +1,25 @@
+From 00520f0aa7856e9322119c6afb84dc3f63325423 Mon Sep 17 00:00:00 2001
+From: David Zeuthen <davidz at redhat.com>
+Date: Thu, 23 Feb 2012 13:47:54 -0500
+Subject: [PATCH] Don't include sys/acl.h - it's not needed
+
+Signed-off-by: David Zeuthen <davidz at redhat.com>
+---
+ src/udiskslinuxfilesystem.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
+index 99ae1f5..797dc46 100644
+--- a/src/udiskslinuxfilesystem.c
++++ b/src/udiskslinuxfilesystem.c
+@@ -29,7 +29,6 @@
+ #include <stdio.h>
+ #include <mntent.h>
+ #include <sys/types.h>
+-#include <sys/acl.h>
+ 
+ #include <glib/gstdio.h>
+ 
+-- 
+1.7.9.1
+
diff --git a/udisks2.spec b/udisks2.spec
index af7117a..9cb65d5 100644
--- a/udisks2.spec
+++ b/udisks2.spec
@@ -8,7 +8,7 @@
 Summary: Disk Manager
 Name: udisks2
 Version: 1.92.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freedesktop.org/wiki/Software/udisks
@@ -51,6 +51,8 @@ Requires: acl
 # for /proc/self/mountinfo, only available in 2.6.26 or higher
 Conflicts: kernel < 2.6.26
 
+Patch0: 0001-Don-t-include-sys-acl.h-it-s-not-needed.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,6 +82,7 @@ daemon. This package is for the udisks 2.x series.
 
 %prep
 %setup -q -n udisks-%{version}
+%patch0 -p1
 
 %build
 %configure --enable-gtk-doc
@@ -137,6 +140,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
 # Note: please don't forget the %{?dist} in the changelog. Thanks
 %changelog
+* Thu Feb 23 2012 David Zeuthen <davidz at redhat.com> - 1.92.0-2%{?dist}
+- Fix build
+
 * Thu Feb 23 2012 David Zeuthen <davidz at redhat.com> - 1.92.0-1%{?dist}
 - Update to release 1.92.0
 


More information about the scm-commits mailing list