[systemd/f18] Fix journal mmap header prototype definition to fix compilation on 32bi

[Lennart Poettering]

commit 1439d1a9f215bcfc22c2ea06e888156c3bd808e7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Sep 22 00:19:20 2012 +0200

     Fix journal mmap header prototype definition to fix compilation on 32bi

 ...ournal-bring-mmap-cache-prototype-in-sync.patch |   24 ++++++++++++++++++++
 systemd.spec                                       |    8 +++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/0001-journal-bring-mmap-cache-prototype-in-sync.patch b/0001-journal-bring-mmap-cache-prototype-in-sync.patch
new file mode 100644
index 0000000..353b7e8
--- /dev/null
+++ b/0001-journal-bring-mmap-cache-prototype-in-sync.patch
@@ -0,0 +1,24 @@
+From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001
+From: Lennart Poettering <lennart at poettering.net>
+Date: Sat, 22 Sep 2012 00:16:13 +0200
+Subject: [PATCH] journal: bring mmap cache prototype in sync
+
+---
+ src/journal/mmap-cache.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
+index de34634..0c42fb8 100644
+--- a/src/journal/mmap-cache.h
++++ b/src/journal/mmap-cache.h
+@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void);
+ MMapCache* mmap_cache_ref(MMapCache *m);
+ MMapCache* mmap_cache_unref(MMapCache *m);
+ 
+-int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret);
++int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret);
+ void mmap_cache_close_fd(MMapCache *m, int fd);
+ void mmap_cache_close_context(MMapCache *m, unsigned context);
+-- 
+1.7.12
+
diff --git a/systemd.spec b/systemd.spec
index cc4a082..fce2cf9 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -22,7 +22,7 @@ Url:            http://www.freedesktop.org/wiki/Software/systemd
 # THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION!
 
 Version:        191
-Release:        1%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        2%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -81,6 +81,8 @@ Source3:        udlfb.conf
 # Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away
 Source4:        listen.conf
 
+Patch1:         0001-journal-bring-mmap-cache-prototype-in-sync.patch
+
 Obsoletes:      SysVinit < 2.86-24, sysvinit < 2.86-24
 Provides:       SysVinit = 2.86-24, sysvinit = 2.86-24
 Provides:       sysvinit-userspace
@@ -187,6 +189,7 @@ glib-based applications using libudev functionality.
 
 %prep
 %setup -q %{?gitcommit:-n %{name}-git%{gitcommit}}
+%patch1 -p1
 
 %build
 %{?gitcommit: ./autogen.sh }
@@ -580,6 +583,9 @@ fi
 %{_libdir}/pkgconfig/gudev-1.0*
 
 %changelog
+* Fri Sep 21 2012 Lennart Poettering <lpoetter at redhat.com> - 191-2
+- Fix journal mmap header prototype definition to fix compilation on 32bit
+
 * Fri Sep 21 2012 Lennart Poettering <lpoetter at redhat.com> - 191-1
 - New upstream release
 - Enable all display managers by default, as discussed with Adam Williamson