Hello community,
here is the log from the commit of package linux-ftools for openSUSE:Factory
checked in at 2015-08-27 08:57:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/linux-ftools (Old)
and /work/SRC/openSUSE:Factory/.linux-ftools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "linux-ftools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/linux-ftools/linux-ftools.changes
2014-08-25 11:04:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.linux-ftools.new/linux-ftools.changes
2015-08-27 08:57:11.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 14 15:28:09 UTC 2015 - norm...@linux.vnet.ibm.com
+
+- use <asm/unistd.h> in place of <asm/unistd_64.h>
+ to avoid build error for different archs
+ Added patch: linux-ftools_use_asm_unistd_h.patch
+
+-------------------------------------------------------------------
New:
----
linux-ftools_use_asm_unistd_h.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ linux-ftools.spec ++++++
--- /var/tmp/diff_new_pack.k2UDmh/_old 2015-08-27 08:57:11.000000000 +0200
+++ /var/tmp/diff_new_pack.k2UDmh/_new 2015-08-27 08:57:11.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package linux-ftools
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,8 @@
Source: linux-ftools-%{hg_version}.tar.gz
Source1: COPYING
Patch0: gcc46.diff
+Patch1: linux-ftools_use_asm_unistd_h.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc
@@ -43,6 +45,7 @@
%prep
%setup -q -n linux-ftools-%{hg_version}
%patch0
+%patch1 -p1
%build
autoreconf -fi
++++++ linux-ftools_use_asm_unistd_h.patch ++++++
From: david.t....@gmail.com
Subject: linux ftools use asm unistd h
unistd_64.h is debian specific.
unistd.h has a ifdef that selects the right distribution
This is based on patch from david.t....@gmail.com found at
https://code.google.com/p/linux-ftools/issues/detail?id=5
Signed-off-by: david.t....@gmail.com
Signed-off-by: Michel Normand <norm...@linux.vnet.ibm.com>
---
linux-fadvise.c | 2 +-
linux-fallocate.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux-ftools-2a7918d4b81b/linux-fadvise.c
===================================================================
--- linux-ftools-2a7918d4b81b.orig/linux-fadvise.c
+++ linux-ftools-2a7918d4b81b/linux-fadvise.c
@@ -5,7 +5,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <sys/syscall.h>
-#include <asm/unistd_64.h>
+#include <asm/unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
Index: linux-ftools-2a7918d4b81b/linux-fallocate.c
===================================================================
--- linux-ftools-2a7918d4b81b.orig/linux-fallocate.c
+++ linux-ftools-2a7918d4b81b/linux-fallocate.c
@@ -4,7 +4,7 @@
#include <sys/stat.h>
#include <unistd.h>
#include <sys/syscall.h>
-#include <asm/unistd_64.h>
+#include <asm/unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
