- fix building on x32

- rel 4

diff --git a/lxc.spec b/lxc.spec
index d53cc13b95a96d760582054b979c1bad4f170a1e..dfaf3facc3a59c3f34c1bf8c801c9491d035f155 100644 (file)
--- a/lxc.spec
+++ b/lxc.spec
@@ -13,7 +13,7 @@ Summary:      Linux Containers userspace tools
 Summary(pl.UTF-8):     Narzędzia do kontenerów linuksowych (LXC)
 Name:          lxc
 Version:       1.0.7
-Release:       3
+Release:       4
 License:       LGPL v2.1+
 Group:         Applications/System
 Source0:       https://www.linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
@@ -22,7 +22,8 @@ Source1:      %{name}-pld.in.sh
 Source2:       %{name}.init
 Source3:       %{name}_macvlan.init
 Source4:       %{name}_macvlan.sysconfig
-Patch1:                %{name}-pld.patch
+Patch0:                %{name}-pld.patch
+Patch1:                x32.patch
 URL:           https://www.linuxcontainers.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -129,6 +130,7 @@ bashowe uzupełnianie nazw dla LXC.
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
 
 cp -p %{SOURCE1} templates/lxc-pld.in

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..73de75f
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,14 @@
+--- lxc-1.0.7/src/lxc/log.c.orig       2014-12-05 21:50:20.000000000 +0100
++++ lxc-1.0.7/src/lxc/log.c    2015-03-13 21:30:29.354757660 +0100
+@@ -91,7 +91,11 @@
+ 
+       ms = event->timestamp.tv_usec / 1000;
+       n = snprintf(buffer, sizeof(buffer),
++#ifdef __ILP32__
++                   "%15s %10lld.%03d %-8s %s - %s:%s:%d - ",
++#else
+                    "%15s %10ld.%03d %-8s %s - %s:%s:%d - ",
++#endif
+                    log_prefix,
+                    event->timestamp.tv_sec,
+                    ms,