Hello community, here is the log from the commit of package sword for openSUSE:Factory checked in at 2016-07-14 09:50:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2016-03-07 13:24:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2016-07-14 09:50:41.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Jul 12 09:13:31 UTC 2016 - i...@marguerite.su + +- update version 1.7.5a1 +- add sword-gcc6-ftemplate-depth.patch, fixed boo#985162 + * fix: template instantiation depth exceeds maximum of 25 + * according to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65042 + we can only increase -ftemplate-depth to greater number than 25 + there's no better way. + +------------------------------------------------------------------- Old: ---- sword-1.7.4.tar.bz2 New: ---- sword-1.7.5a1.tar.gz sword-gcc6-ftemplate-depth.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sword.spec ++++++ --- /var/tmp/diff_new_pack.kyAIpx/_old 2016-07-14 09:50:43.000000000 +0200 +++ /var/tmp/diff_new_pack.kyAIpx/_new 2016-07-14 09:50:43.000000000 +0200 @@ -16,27 +16,30 @@ # -%define libver 1_7_4 -%define libinstver 1.7.4 - +%define libver 1_7_5 +%define libinstver 1.7.5 Name: sword -Version: 1.7.4 +Version: 1.7.5~a1 Release: 0 Summary: Framework for manipulating Bible texts License: GPL-2.0 Group: Development/Libraries/C and C++ Url: http://www.crosswire.org/sword -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-1.7.5a1.tar.gz Source1: %{name}-rpmlintrc Patch1: sword-1.7.1-curl.patch Patch2: sword_sysdata_changes.patch -Requires: libsword-%{libver} = %version +# PATCH-FIX-UPSTREAM marguer...@opensuse.org - increase -ftemplate-depth to 100 +Patch3: sword-gcc6-ftemplate-depth.patch BuildRequires: curl-devel BuildRequires: gcc-c++ BuildRequires: icu BuildRequires: libicu-devel +BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: zlib-devel +Requires: libsword-%{libver} = %{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-build # # openSUSE # @@ -68,7 +71,6 @@ %if ( %{defined centos_version} && 0%{?centos_version} < 600 ) BuildRequires: sqlite %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The SWORD Project is an effort to create an ever expanding software package for @@ -90,27 +92,25 @@ %package devel Summary: Include files and static libraries for developing sword applications Group: Development/Libraries/Other +Requires: sword = %{version} %if 0%{?centos_version} < 600 Requires: curl-devel %else Requires: libcurl-devel %endif -Requires: sword = %{version} %description devel Include files and static libraries for developing sword applications. This package is required to compile Sword frontends, too. %prep -%setup -q +%setup -q -n sword-1.7.5 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build - -%if 0%{?mandriva_version} -autoreconf -%endif +NOCONFIGURE=1 ./autogen.sh %configure --disable-static \ --with-icu \ @@ -146,19 +146,15 @@ %install %make_install install_config -rm %{buildroot}/%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete -print pushd %{buildroot}/%{_bindir} strip * strip %{buildroot}/%{_libdir}/libsword*.so popd %post -n libsword-%{libver} -p /sbin/ldconfig - %postun -n libsword-%{libver} -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog LICENSE NEWS README doc/translation-template.conf ++++++ sword-gcc6-ftemplate-depth.patch ++++++ Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac @@ -197,7 +197,7 @@ AM_CFLAGS="$AM_CFLAGS -D_ICUSWORD_" fi -AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25" +AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-100" if test x$enable_warnings = xyes; then AM_CFLAGS="$AM_CFLAGS -Werror" @@ -250,7 +250,7 @@ else fi if test x$with_cxx11regex = xyes; then - AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11 -ftemplate-depth=100" + AM_CXXFLAGS="$AM_CXXFLAGS -DUSECXX11REGEX -std=c++11" fi # ---------------------------------------------------------------------
