Hello community, here is the log from the commit of package sword for openSUSE:Factory checked in at 2012-03-20 12:11:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sword (Old) and /work/SRC/openSUSE:Factory/.sword.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sword", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/sword/sword.changes 2011-09-23 12:47:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2012-03-20 12:11:57.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Mar 16 17:43:53 UTC 2012 - [email protected] + +- Add sword-gcc47.patch: Fix build with gcc 4.7. + +------------------------------------------------------------------- Old: ---- sword-1.6.2-fix_build_with_new_curl.patch sword-1.6.2.tar.bz2 New: ---- sword-1.6.2+svn2679.tar.bz2 sword-gcc47.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sword.spec ++++++ --- /var/tmp/diff_new_pack.w1KkEG/_old 2012-03-20 12:11:58.000000000 +0100 +++ /var/tmp/diff_new_pack.w1KkEG/_new 2012-03-20 12:11:58.000000000 +0100 @@ -1,24 +1,35 @@ # # spec file for package sword # -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define libver 1_6_2 +%define libinstver 1.6.2 Name: sword -Version: 1.6.2 -Release: 1 -License: GPL-2.0 +Version: 1.6.2+svn2679 +Release: 0 Summary: Framework for manipulating Bible texts -Url: http://www.crosswire.org/sword +License: GPL-2.0 Group: Development/Libraries/C and C++ +Url: http://www.crosswire.org/sword Source0: %{name}-%{version}.tar.bz2 Patch1: sword-1.6.1-fix_compiler_warnings.patch Patch2: sword-1.6.1-curl.patch -Patch3: sword-1.6.2-fix_build_with_new_curl.patch +Patch3: sword-gcc47.patch Requires: libsword-%{libver} = %version BuildRequires: curl-devel BuildRequires: gcc-c++ @@ -45,8 +56,18 @@ # Mandriva # %if 0%{?mandriva_version} +%ifarch x86_64 +BuildRequires: lib64clucene-devel +%else BuildRequires: libclucene-devel %endif +%endif +# +# CentOS +# +%if ( %{defined centos_version} && 0%{?centos_version} < 600 ) +BuildRequires: sqlite +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,7 +90,11 @@ %package devel Summary: Include files and static libraries for developing sword applications Group: Development/Libraries/Other +%if 0%{?centos_version} < 600 +Requires: curl-devel +%else Requires: libcurl-devel +%endif Requires: sword = %{version} %description devel @@ -80,9 +105,14 @@ %setup -q %patch1 %patch2 -%patch3 +%patch3 -p1 %build + +%if 0%{?mandriva_version} +autoreconf +%endif + %configure --disable-static \ --with-icu \ --enable-tests \ @@ -148,7 +178,7 @@ %files -n libsword-%{libver} %defattr(-,root,root) %doc LICENSE -%{_libdir}/libsword-%{version}.so +%{_libdir}/libsword-%{libinstver}.so %files devel %defattr(-,root,root) @@ -156,6 +186,6 @@ %{_includedir}/* %{_libdir}/pkgconfig/sword.pc %{_libdir}/*.so -%exclude %{_libdir}/libsword-%{version}.so +%exclude %{_libdir}/libsword-%{libinstver}.so %changelog ++++++ sword-gcc47.patch ++++++ Index: sword-1.6.2+svn2679/include/multimapwdef.h =================================================================== --- sword-1.6.2+svn2679.orig/include/multimapwdef.h +++ sword-1.6.2+svn2679/include/multimapwdef.h @@ -19,14 +19,14 @@ public: } T& operator[](const Key& k) { - if (find(k) == this->end()) { - insert(value_type(k, T())); + if (this->find(k) == this->end()) { + this->insert(value_type(k, T())); } - return (*(find(k))).second; + return (*(this->find(k))).second; } bool has(const Key& k, const T &val) const { - typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k); - typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k); + typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k); + typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k); for (; start!=end; start++) { if (start->second == val) return true; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
