Hello community, here is the log from the commit of package xiphos for openSUSE:Factory checked in at 2013-09-09 11:04:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xiphos (Old) and /work/SRC/openSUSE:Factory/.xiphos.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xiphos" Changes: -------- --- /work/SRC/openSUSE:Factory/xiphos/xiphos.changes 2011-10-12 16:17:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xiphos.new/xiphos.changes 2013-09-09 11:04:04.000000000 +0200 @@ -1,0 +2,25 @@ +Sun Sep 8 18:48:05 UTC 2013 - [email protected] + +- updated to 3.1.5: + + The WebKit display driver. + + GTK3 compatibility. + + Module-internal footnote & xref numbering/lettering is respected. + + Display of headings, footnotes, xrefs, and red words all default On. + + Image content is resized in parallel windows and the previewer. + + Module lists include modules' 1-line descriptions as well as short names. + + Verse numbers will no longer be "widowed" (left alone at the end of a + line) by being forced to combine against the first word of their verse. + + Verse number display is configurable: bold, brackets, superscripts. + + RtoL consistency improvements. + + Studypad save respects its default directory specification. + + Base font is respected in all parallel views. + + Font selection order has been fixed: Any user specification (per module + or per language) supercedes module configuration file specification. + + In export, avoid more than one dialog, ever, about checking a module's + license, and change copy/export defaults to plaintext and 1 verse. + + Ctrl-0 (zero) forces base font size to 0. + + Ctrl-[1-9] selects the Nth tab. + + Countless internal module, cache, font, and display fixes. +- added dependency on sword package (it contains sword global configurations) + +------------------------------------------------------------------- Old: ---- xiphos-20111010svn4310.tar.bz2 New: ---- xiphos-3.1.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xiphos.spec ++++++ --- /var/tmp/diff_new_pack.Ia1DeF/_old 2013-09-09 11:04:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Ia1DeF/_new 2013-09-09 11:04:05.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xiphos # -# Copyright (c) 2011 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,48 +16,127 @@ # +%if ( 0%{?suse_version} >= 1200 || 0%{?fedora} > 14 ) +%define gtk3 1 +%endif Name: xiphos -Version: 3.1.4 -Release: 1 -License: GPL-2.0 +Version: 3.1.5 +Release: 0 Summary: GNOME-based Bible research tool -Url: http://xiphos.org/ +License: GPL-2.0 Group: Productivity/Scientific/Other -Source0: xiphos-20111010svn4310.tar.bz2 +Url: http://xiphos.org/ +Source0: xiphos-3.1.5.tar.bz2 Source1: %{name}.desktop -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif + BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: glibc-devel -BuildRequires: gnome-doc-utils-devel -BuildRequires: pkgconfig(cairo) -BuildRequires: pkgconfig(dbus-glib-1) -BuildRequires: pkgconfig(glib-2.0) -%if 0%{?suse_version} <= 1130 -BuildRequires: gnome-spell2 -%endif -BuildRequires: gtkhtml2-devel BuildRequires: intltool -BuildRequires: libMagick++-devel +%if %{undefined mdkversion} BuildRequires: libbonobo-devel -BuildRequires: libcurl-devel BuildRequires: libgnomeui-devel +%endif BuildRequires: libgsf-devel BuildRequires: libidn-devel -BuildRequires: libwebkitgtk3-devel BuildRequires: pcre-devel BuildRequires: perl-XML-Parser BuildRequires: scrollkeeper -BuildRequires: sword-devel -BuildRequires: xorg-x11-libXdmcp-devel +BuildRequires: sword-devel > 1.6.2 +%if ( %{undefined centos_version} && 0%{?suse_version} != 1110 ) +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libglade-2.0) +%endif + +%if ( %{undefined fedora} && %{undefined centos_version} && %{undefined mdkversion} && 0%{?suse_version} != 1110 ) + +BuildRequires: gnome-doc-utils-devel +BuildRequires: libMagick++-devel +BuildRequires: xorg-x11-libXdmcp-devel + + %if %{defined gtk3} +BuildRequires: libwebkitgtk3-devel + %else +BuildRequires: libwebkitgtk-devel + %endif +%endif +# +# CentOS +# +%if %{defined centos_version} +BuildRequires: cairo-devel +BuildRequires: dbus-glib-devel +BuildRequires: glib2-devel +BuildRequires: gnome-doc-utils +BuildRequires: gtk2-devel +BuildRequires: gtkhtml3-devel +BuildRequires: libXdmcp-devel +BuildRequires: libglade2-devel +BuildRequires: perl-Compress-Zlib +BuildRequires: sane-backends-libs + %if 0%{?centos_version} >= 600 +BuildRequires: libcurl-devel +BuildRequires: webkitgtk-devel + %else +BuildRequires: curl-devel +BuildRequires: python26 +BuildRequires: sqlite +BuildRequires: xulrunner-devel +%define xulbuild 1 + %endif +%endif +# +# openSUSE +# +%if %{defined suse_version} +BuildRequires: update-desktop-files +%if %{defined gtk3} +BuildRequires: gtkhtml-devel +%else +BuildRequires: gtkhtml2-devel +%endif +Requires: sword Recommends: sword-bible Recommends: sword-commentary +%if 0%{?suse_version} <= 1130 +BuildRequires: gnome-spell2 +%endif +%endif +# +# SLES +# +%if 0%{?suse_version} == 1110 +BuildRequires: gnome-doc-utils +BuildRequires: mozilla-xulrunner190-devel +%define xulbuild 1 +%endif +# +# Fedora +# +%if %{defined fedora} +BuildRequires: gnome-doc-utils +BuildRequires: gtkhtml3-devel +BuildRequires: libXdmcp-devel +BuildRequires: sane-backends-libs +BuildRequires: webkitgtk3-devel +%endif +# +# Mandriva +# +%if %{defined mdkversion} +BuildRequires: gnome-doc-utils +BuildRequires: libMagick-devel +BuildRequires: libgnomeui2-devel +BuildRequires: libxdmcp-devel +BuildRequires: polkit-gnome +BuildRequires: pkgconfig(libbonobo-2.0) +%endif + Provides: sword-frontend BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -70,12 +149,29 @@ by Crosswire Bible Society through the SWORD Project. %prep -%setup -q -n xiphos-svn4310 +%setup -q -n xiphos-3.1.5 %build +# SLES lacks the abillity to build help files for some reason +%if %{defined sles_version} +%define EXTRAOPTS --disable-help +%endif + +rm -rf build export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" +%if ( %{defined centos_version} && 0%{?centos_version} < 600 ) +/usr/bin/python26 \ +%endif +%if %{defined xulbuild} +./waf configure --prefix=%{_prefix} --backend=xulrunner --gtk=2 %{?EXTRAOPTS} +%else + %if %{defined gtk3} ./waf configure --prefix=%{_prefix} --backend=webkit --gtk=3 + %else +./waf configure --prefix=%{_prefix} --backend=webkit --gtk=2 + %endif +%endif ./waf build %install @@ -86,15 +182,21 @@ %suse_update_desktop_file -n %{buildroot}%{_datadir}/applications/%{name}.desktop %endif +%if ( %{undefined fedora} && %{undefined centos_version} ) mkdir -p %{buildroot}%_defaultdocdir/%{name} mv %{buildroot}%{_datadir}/doc/%{name}/* %{buildroot}%_defaultdocdir/%{name}/ rmdir %{buildroot}%{_datadir}/doc/%{name} +%endif + +rm %{buildroot}%_defaultdocdir/%{name}/INSTALL install -Dm644 xiphos.1 %{buildroot}%{_mandir}/man1/xiphos.1 %find_lang %{name} +%if %{undefined fedora} %fdupes -s %{buildroot} +%endif %clean rm -rf %{buildroot} @@ -118,5 +220,10 @@ %{_datadir}/icons/hicolor/scalable/apps/* %{_datadir}/applications/%{name}.desktop %{_mandir}/man1/* +%if ( %{defined centos_version} || %{defined fedora} ) +%{_defaultdocdir}/%{name}/* +%{_datadir}/gnome/help/%{name}/* +%{_datadir}/omf/%{name}/* +%endif %changelog ++++++ xiphos-20111010svn4310.tar.bz2 -> xiphos-3.1.5.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xiphos/xiphos-20111010svn4310.tar.bz2 /work/SRC/openSUSE:Factory/.xiphos.new/xiphos-3.1.5.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
