Hello community, here is the log from the commit of package sword for openSUSE:Factory checked in at 2018-07-27 10:54:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sword (Old) and /work/SRC/openSUSE:Factory/.sword.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sword" Fri Jul 27 10:54:50 2018 rev:15 rq:624008 version:1.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/sword/sword.changes 2018-01-07 17:23:51.670278376 +0100 +++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2018-07-27 10:55:17.889538166 +0200 @@ -1,0 +2,15 @@ +Thu Jul 19 09:39:07 UTC 2018 - [email protected] + +- add Apache-2.0 to the license tag + +------------------------------------------------------------------- +Mon Jun 4 20:59:24 UTC 2018 - [email protected] + +- update to 1.8.1: + + Added bindings: Android and cordova + + Added French mapping data + + Added --with-icuregex option to use ICU regex engine +- remove sword-gcc6-ftemplate-depth.patch as fixed upstream +- add -DU_USING_ICU_NAMESPACE=1 to fix boo#1095666 + +------------------------------------------------------------------- Old: ---- sword-1.7.5a1.tar.gz sword-gcc6-ftemplate-depth.patch New: ---- sword-1.8.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sword.spec ++++++ --- /var/tmp/diff_new_pack.qjtO3q/_old 2018-07-27 10:55:18.473539284 +0200 +++ /var/tmp/diff_new_pack.qjtO3q/_new 2018-07-27 10:55:18.477539292 +0200 @@ -1,7 +1,7 @@ # # spec file for package sword # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -16,21 +16,20 @@ # -%define libver 1_7_5 -%define libinstver 1.7.5 +%define major 1.8 +%define libver 1_8_1 +%define libinstver 1.8.1 Name: sword -Version: 1.7.5~a1 +Version: 1.8.1 Release: 0 Summary: Framework for manipulating Bible texts -License: GPL-2.0 +License: GPL-2.0-only AND Apache-2.0 Group: Development/Libraries/C and C++ URL: http://www.crosswire.org/sword -Source0: %{name}-1.7.5a1.tar.gz -Source1: %{name}-rpmlintrc +Source0: http://crosswire.org/ftpmirror/pub/sword/source/v%{major}/sword-%{version}.tar.gz +Source1: sword-rpmlintrc Patch1: sword-1.7.1-curl.patch Patch2: sword_sysdata_changes.patch -# PATCH-FIX-UPSTREAM [email protected] - increase -ftemplate-depth to 100 -Patch3: sword-gcc6-ftemplate-depth.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -71,12 +70,12 @@ is required to compile Sword frontends, too. %prep -%setup -q -n sword-1.7.5 +%setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build +export CXXFLAGS="%{optflags} -DU_USING_ICU_NAMESPACE=1" autoreconf -fiv %configure \ --disable-static \ ++++++ sword-1.7.5a1.tar.gz -> sword-1.8.1.tar.gz ++++++ ++++ 184000 lines of diff (skipped) ++++++ sword_sysdata_changes.patch ++++++ --- /var/tmp/diff_new_pack.qjtO3q/_old 2018-07-27 10:55:18.929540157 +0200 +++ /var/tmp/diff_new_pack.qjtO3q/_new 2018-07-27 10:55:18.929540157 +0200 @@ -11,10 +11,10 @@ include/sysdata.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -Index: sword-1.7.4/include/sysdata.h +Index: sword-1.8.1/include/sysdata.h =================================================================== ---- sword-1.7.4.orig/include/sysdata.h -+++ sword-1.7.4/include/sysdata.h +--- sword-1.8.1.orig/include/sysdata.h ++++ sword-1.8.1/include/sysdata.h @@ -29,8 +29,9 @@ #ifdef USE_AUTOTOOLS #include "config.h" @@ -26,7 +26,7 @@ typedef signed char __s8; typedef unsigned char __u8; -@@ -50,6 +51,7 @@ typedef unsigned __int64 __u64; +@@ -51,6 +52,7 @@ typedef unsigned __int64 __u64; typedef signed long long __s64; typedef unsigned long long __u64; #endif
