commit sword for openSUSE:Factory
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 - kkir...@opensuse.org
+
+- add Apache-2.0 to the license tag
+
+---
+Mon Jun 4 20:59:24 UTC 2018 - kkir...@opensuse.org
+
+- 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
-%definelibinstver 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 marguer...@opensuse.org - 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
commit sword for openSUSE:Factory
Hello community,
here is the log from the commit of package sword for openSUSE:Factory checked
in at 2018-01-07 17:23:41
Comparing /work/SRC/openSUSE:Factory/sword (Old)
and /work/SRC/openSUSE:Factory/.sword.new (New)
Package is "sword"
Sun Jan 7 17:23:41 2018 rev:14 rq:562201 version:1.7.5~a1
Changes:
--- /work/SRC/openSUSE:Factory/sword/sword.changes 2016-07-14
09:50:41.0 +0200
+++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2018-01-07
17:23:51.670278376 +0100
@@ -1,0 +2,10 @@
+Mon Dec 18 09:43:47 UTC 2017 - mplus...@suse.com
+
+- Use pkgconfig style dependencies and drop distro specific
+ conditions
+- Let rpm generate dependencies/requirements and do not inject them
+ manually
+- Cleanup with spec-cleaner
+- Do not strip created libraries
+
+---
Other differences:
--
++ sword.spec ++
--- /var/tmp/diff_new_pack.3k0K0y/_old 2018-01-07 17:23:52.210253066 +0100
+++ /var/tmp/diff_new_pack.3k0K0y/_new 2018-01-07 17:23:52.214252878 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sword
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -24,53 +24,26 @@
Summary:Framework for manipulating Bible texts
License:GPL-2.0
Group: Development/Libraries/C and C++
-Url:http://www.crosswire.org/sword
+URL:http://www.crosswire.org/sword
Source0:%{name}-1.7.5a1.tar.gz
Source1:%{name}-rpmlintrc
Patch1: sword-1.7.1-curl.patch
Patch2: sword_sysdata_changes.patch
# PATCH-FIX-UPSTREAM marguer...@opensuse.org - increase -ftemplate-depth to 100
Patch3: sword-gcc6-ftemplate-depth.patch
-BuildRequires: curl-devel
+BuildRequires: autoconf
+BuildRequires: automake
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
-#
-%if 0%{?suse_version}
-BuildRequires: clucene-core-devel
+BuildRequires: pkgconfig(cppunit)
+BuildRequires: pkgconfig(icu-i18n)
+BuildRequires: pkgconfig(libclucene-core)
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(zlib)
Recommends: sword-bible
Recommends: sword-commentary
Recommends: sword-frontend
-%endif
-#
-# Fedora
-#
-%if 0%{?fedora_version}
-BuildRequires: clucene-core-devel
-%endif
-#
-# 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
%description
The SWORD Project is an effort to create an ever expanding software package for
@@ -83,8 +56,6 @@
%package -n libsword-%{libver}
Summary:Shared library for sword
Group: Development/Libraries/Other
-Provides: libsword = %{version}
-Provides: libsword%{libver}
%description -n libsword-%{libver}
This package contains the shared library for applications using sword.
@@ -92,12 +63,8 @@
%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: libsword-%{libver} = %{version}
+Requires: pkgconfig(libcurl)
%description devel
Include files and static libraries for developing sword applications. This
package
@@ -110,9 +77,9 @@
%patch3 -p1
%build
-NOCONFIGURE=1 ./autogen.sh
-
-%configure --disable-static \
+autoreconf -fiv
+%configure \
+ --disable-static \
--with-icu \
--enable-tests \
--enable-examples
@@ -147,16 +114,11 @@
%install
%make_install install_config
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
%files
-%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog LICENSE NEWS README
doc/translation-template.conf
%config(noreplace) %{_sysconfdir}/sword.conf
%{_bindir}/*
@@ -167,11 +129,9 @@
%{_datadir}/sword/mods.d/globals.conf
%files -n libsword-%{libver}
-%defattr(-,root,root)
commit sword for openSUSE:Factory
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.0 +0100
+++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2016-07-14
09:50:41.0 +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.0 +0200
+++ /var/tmp/diff_new_pack.kyAIpx/_new 2016-07-14 09:50:43.0 +0200
@@ -16,27 +16,30 @@
#
-%define libver 1_7_4
-%definelibinstver 1.7.4
-
+%define libver 1_7_5
+%definelibinstver 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
# -
commit sword for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2016-03-07
13:24:43.0 +0100
@@ -1,0 +2,5 @@
+Wed Feb 24 13:33:48 UTC 2016 - norm...@linux.vnet.ibm.com
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.QVZZc9/_new 2016-03-07 13:24:44.0 +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
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
---
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
-
+#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
commit sword for openSUSE:Factory
Hello community,
here is the log from the commit of package sword for openSUSE:Factory checked
in at 2015-04-18 10:38:51
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 2014-06-25
21:20:16.0 +0200
+++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2015-04-18
10:38:52.0 +0200
@@ -1,0 +2,10 @@
+Sun Dec 28 01:17:58 UTC 2014 - l...@linux-schulserver.de
+
+- update to 1.7.4:
+ + Fixed endless loop in osis2mod for some inputs.
+ + Added support for Psalm Book divisions using
+div type=majorSection from GHellings
+ + Corrected anomalous OSIS highlighting output w/GHellings'
+patches in src/modules/filters/osis{plain,xhtml}.cpp
+
+---
Old:
sword-1.7.3.tar.bz2
New:
sword-1.7.4.tar.bz2
Other differences:
--
++ sword.spec ++
--- /var/tmp/diff_new_pack.quqnt9/_old 2015-04-18 10:38:53.0 +0200
+++ /var/tmp/diff_new_pack.quqnt9/_new 2015-04-18 10:38:53.0 +0200
@@ -16,11 +16,11 @@
#
-%define libver 1_7_3
-%definelibinstver 1.7.3
+%define libver 1_7_4
+%definelibinstver 1.7.4
Name: sword
-Version:1.7.3
+Version:1.7.4
Release:0
Summary:Framework for manipulating Bible texts
License:GPL-2.0
@@ -143,7 +143,7 @@
done
%install
-%makeinstall install_config
+%make_install install_config
rm %{buildroot}/%{_libdir}/*.la
pushd %{buildroot}/%{_bindir}
strip *
@@ -170,7 +170,6 @@
%files -n libsword-%{libver}
%defattr(-,root,root)
-%doc LICENSE
%{_libdir}/libsword-%{libinstver}.so
%files devel
++ sword-1.7.3.tar.bz2 - sword-1.7.4.tar.bz2 ++
4162 lines of diff (skipped)
commit sword for openSUSE:Factory
Hello community,
here is the log from the commit of package sword for openSUSE:Factory checked
in at 2014-06-25 21:20:15
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 2014-01-10
07:16:34.0 +0100
+++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2014-06-25
21:20:16.0 +0200
@@ -1,0 +2,12 @@
+Wed May 14 11:17:00 UTC 2014 - riggwel...@opensuse.org
+
+- update to 1.7.3:
+ + Added support for xz (LZMA2) module compression via liblzma
+ + Added support for bzip2 (Burrows-Wheeler) module compression via
+libbz2
+ + Added zVerse4, zText4, zCom4 classes to support compressed
+text/commentary modules with entry sizes 64k
+ + Added C# bindings contributed by Daniel Hughes
+tramps...@gmail.com
+
+---
Old:
sword-1.7.1.tar.bz2
New:
sword-1.7.3.tar.bz2
Other differences:
--
++ sword.spec ++
--- /var/tmp/diff_new_pack.vfxRxC/_old 2014-06-25 21:20:17.0 +0200
+++ /var/tmp/diff_new_pack.vfxRxC/_new 2014-06-25 21:20:17.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package sword
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -16,11 +16,11 @@
#
-%define libver 1_7_1
-%definelibinstver 1.7.1
+%define libver 1_7_3
+%definelibinstver 1.7.3
Name: sword
-Version:1.7.1
+Version:1.7.3
Release:0
Summary:Framework for manipulating Bible texts
License:GPL-2.0
@@ -159,7 +159,7 @@
%files
%defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog LICENSE NEWS README doc examples
+%doc AUTHORS COPYING ChangeLog LICENSE NEWS README
doc/translation-template.conf
%config(noreplace) %{_sysconfdir}/sword.conf
%{_bindir}/*
%dir %{_datadir}/sword
++ sword-1.7.1.tar.bz2 - sword-1.7.3.tar.bz2 ++
11497 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit sword for openSUSE:Factory
Hello community,
here is the log from the commit of package sword for openSUSE:Factory checked
in at 2014-01-10 07:16:32
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 2012-03-20
12:11:57.0 +0100
+++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2014-01-10
07:16:34.0 +0100
@@ -1,0 +2,46 @@
+Tue Dec 31 14:39:46 UTC 2013 - l...@linux-schulserver.de
+
+- update to 1.7.1:
+ Many new versifications and locale, large scale refactoring and
+ standardisation of many methods and the addition of filters for
+ standard compliant XHTML output are probably the most important
+ improvements.
+ Improved output in various formats, handling of bibliographic data
+ and addition of new transports to the install manager are other
+ changes.
+ We will from now on maintain both a maintenance branch for 1.7 and
+ a development branch for new features.
+ Some entries from Changelog:
+ + Add a new Option filter, OSISReferenceLinks
+ + Removed PLAINHTML and PLAINFootnotes filters
+ + More examples, including: show a chapter, verse range
+ + Greatly improved navigation with intros and normalization
+turned on/off
+ + New .conf entries honored:
+StrongsPadding=false, which turns off
+logic to detect strongs numbers and add padding
+CaseSensitiveKeys=true, which makes a lexicon case sensitive
+ + Added support to install from SFTP sources using username/password
+authentication in places where cURL has SFTP support (no support
+for public-key auth yet)
+ + Starting (very minimal) support for TEI in xml2gbs
+ + Changed default log level to WARN from INFO
+ + New Lucene index field for searching 'morph'
+ + InstallMgr now supports HTTPS connections where cURL has support
+for that transport
+ + Allow div in header of osis document
+ + Allow comments to be in osis document and to be stripped out
+ + Added ability for *HTML* wrappers to render n attribute from notes
+ + Removed SynodalP v11n from library
+ + Improved handling of CLucene and included support for CLucene 2
+ + Added RTFHTML parsing of rtf \\number codes to facilitate .conf files
+ + Added sane parameter parsing to imp2ld
+ + Added methods for utf8 / wchar conversion to help clucene
+ + added Faroese, Pohnpeian Locale
+- disabled osis testsuite for the moment
+- removed sword-gcc47.patch and
+- adapted sword-1.6.1-curl.patch (sword-1.7.1-curl.patch)
+- removed sword-1.6.1-fix_compiler_warnings.patch
+- added rpmlintrc to ignore notes for the examples
+
+---
Old:
sword-1.6.1-curl.patch
sword-1.6.1-fix_compiler_warnings.patch
sword-1.6.2+svn2679.tar.bz2
sword-gcc47.patch
New:
sword-1.7.1-curl.patch
sword-1.7.1.tar.bz2
sword-rpmlintrc
Other differences:
--
++ sword.spec ++
--- /var/tmp/diff_new_pack.FY7BcZ/_old 2014-01-10 07:16:35.0 +0100
+++ /var/tmp/diff_new_pack.FY7BcZ/_new 2014-01-10 07:16:35.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package sword
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -16,20 +16,19 @@
#
-%define libver 1_6_2
-%definelibinstver 1.6.2
+%define libver 1_7_1
+%definelibinstver 1.7.1
Name: sword
-Version:1.6.2+svn2679
+Version:1.7.1
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
-Patch1: sword-1.6.1-fix_compiler_warnings.patch
-Patch2: sword-1.6.1-curl.patch
-Patch3: sword-gcc47.patch
+Source1:%{name}-rpmlintrc
+Patch1: sword-1.7.1-curl.patch
Requires: libsword-%{libver} = %version
BuildRequires: curl-devel
BuildRequires: gcc-c++
@@ -103,9 +102,7 @@
%prep
%setup -q
-%patch1
-%patch2
-%patch3 -p1
+%patch1 -p1
%build
@@ -121,14 +118,11 @@
%check
cd tests/testsuite
-# could not run all tests, as verseparsing-utf8 tries to
-# use already installed locales and not the currently
-# build ones :-(
# ./runall.sh
TESTSUITE=$(for i in *.good; do basename $i .good; done)
for i in $TESTSUITE; do
case $i in
- verseparsing*)
+ osis*)
commit sword for openSUSE:Factory
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.0 +0200
+++ /work/SRC/openSUSE:Factory/.sword.new/sword.changes 2012-03-20
12:11:57.0 +0100
@@ -1,0 +2,5 @@
+Fri Mar 16 17:43:53 UTC 2012 - dims...@opensuse.org
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.w1KkEG/_new 2012-03-20 12:11:58.0 +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
+%definelibinstver 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::multimapKey, T, Compare::const_iterator start =
lower_bound(k);
-
commit sword for openSUSE:Factory
Hello community, here is the log from the commit of package sword for openSUSE:Factory checked in at 2011-12-06 19:06:46 Comparing /work/SRC/openSUSE:Factory/sword (Old) and /work/SRC/openSUSE:Factory/.sword.new (New) Package is sword, Maintainer is Changes: Other differences: -- ++ sword.spec ++ --- /var/tmp/diff_new_pack.rE7vUq/_old 2011-12-06 19:40:39.0 +0100 +++ /var/tmp/diff_new_pack.rE7vUq/_new 2011-12-06 19:40:39.0 +0100 @@ -11,7 +11,7 @@ Name: sword Version:1.6.2 Release:1 -License:GPLv2 +License:GPL-2.0 Summary:Framework for manipulating Bible texts Url:http://www.crosswire.org/sword Group: Development/Libraries/C and C++ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
