Hello community, here is the log from the commit of package sword for openSUSE:Factory checked in at 2016-03-07 13:24:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sword (Old) and /work/SRC/openSUSE:Factory/.sword.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sword" Changes: -------- --- /work/SRC/openSUSE:Factory/sword/sword.changes 2015-04-18 10:38:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2016-03-07 13:24:43.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 24 13:33:48 UTC 2016 - [email protected] + +- add sword_sysdata_changes.patch required for build xiphos + +------------------------------------------------------------------- New: ---- sword_sysdata_changes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sword.spec ++++++ --- /var/tmp/diff_new_pack.QVZZc9/_old 2016-03-07 13:24:44.000000000 +0100 +++ /var/tmp/diff_new_pack.QVZZc9/_new 2016-03-07 13:24:44.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sword # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -29,6 +29,7 @@ Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc Patch1: sword-1.7.1-curl.patch +Patch2: sword_sysdata_changes.patch Requires: libsword-%{libver} = %version BuildRequires: curl-devel BuildRequires: gcc-c++ @@ -103,6 +104,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build ++++++ sword_sysdata_changes.patch ++++++ From: Michel Normand <[email protected]> Subject: sword sysdata changes Date: Wed, 24 Feb 2016 14:12:06 +0100 sword sysdata changes required to avoid build error of xyphos package when built on PowerPC architecture Signed-off-by: Michel Normand <[email protected]> --- include/sysdata.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: sword-1.7.4/include/sysdata.h =================================================================== --- sword-1.7.4.orig/include/sysdata.h +++ sword-1.7.4/include/sysdata.h @@ -29,8 +29,9 @@ #ifdef USE_AUTOTOOLS #include "config.h" #endif +#include <asm/types.h> - +#if !defined(_ASM_GENERIC_INT_L64_H) && !defined( _ASM_GENERIC_INT_LL64_H) typedef signed char __s8; typedef unsigned char __u8; @@ -50,6 +51,7 @@ typedef unsigned __int64 __u64; typedef signed long long __s64; typedef unsigned long long __u64; #endif +#endif #undef __swswap16 #undef __swswap32
