Hello community, here is the log from the commit of package xiphos for openSUSE:Factory checked in at 2017-08-28 15:18:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xiphos (Old) and /work/SRC/openSUSE:Factory/.xiphos.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xiphos" Mon Aug 28 15:18:15 2017 rev:17 rq:518964 version:4.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xiphos/xiphos.changes 2017-03-16 09:52:13.499929166 +0100 +++ /work/SRC/openSUSE:Factory/.xiphos.new/xiphos.changes 2017-08-28 15:19:30.600956373 +0200 @@ -1,0 +2,42 @@ +Sun Aug 20 14:51:37 UTC 2017 - zaitor@opensuse.org + +- Update to version 4.0.6: + + Fixed longstanding display problem with webkit2 (now req'd for + fedora). + + Added alt-L toggle lemma. + + Added View Xiphos Releases to Help menu. + + Fixed biblesync passphrase preservation. + + Internal: + - Removed all ancient ImageMagick references. + - Removed HAVE_GTK_xxx in favor of GTK_VERSION_CHECK. + - Fixed wk2 search result. + + Updated translations. +- Drop xiphos-fix-missing-return.patch and + xiphos-man-page-xiphos-nav.patch: Fixed upstream. + +------------------------------------------------------------------- +Sun Jun 4 20:16:06 UTC 2017 - zaitor@opensuse.org + +- Update to version 4.0.5: + + ReadAloud: Speak verse# only if we are showing verse#s in text + as well. + + Fix crash caused by lack of collator during mod.mgr in first + run. +- Run spec-cleaner. +- Drop conditionals for other distros and old unsupported + openSUSE/SLE. +- Pkgconfigify BuildRequires, drop obsolete ones. +- Build for gtk3 only. +- Following the above, remove webkitgtk3-devel BuildRequires and + add pkgconfig(webkit2gtk-4.0) and stop passing + --enable-webkit-editor and pass --enable-webkit2instead. +- Add docbook-utils-minimal BuildRequrires to build docbock2man + support. +- Add xiphos-fix-missing-return.patch: Fix missing return in + non-void function, patch from upstream git. +- Add xiphos-man-page-xiphos-nav.patch: Add missing man page, patch + from upstream git. +- Apply fdupes macro, silence rpmlint about duplicate files. +- Add lang-package macro, split out lang-package. + +------------------------------------------------------------------- Old: ---- xiphos-4.0.4.tar.gz New: ---- xiphos-4.0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xiphos.spec ++++++ --- /var/tmp/diff_new_pack.8Fak84/_old 2017-08-28 15:19:31.864778769 +0200 +++ /var/tmp/diff_new_pack.8Fak84/_new 2017-08-28 15:19:31.876777083 +0200 @@ -1,7 +1,7 @@ # # spec file for package xiphos # -# Copyright (c) 2015 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 @@ -16,130 +16,42 @@ # -%if ( 0%{?suse_version} >= 1200 || 0%{?fedora} > 14 ) -%define gtk3 0 -%endif - Name: xiphos -Version: 4.0.4 +Version: 4.0.6 Release: 0 Summary: GNOME-based Bible research tool License: GPL-2.0 Group: Productivity/Scientific/Other Url: http://xiphos.org/ -Source0: xiphos-%{version}.tar.gz +Source0: https://github.com/crosswire/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: %{name}.desktop - -BuildRequires: biblesync-devel >= 1.1.2 +BuildRequires: docbook-utils-minimal BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: gettext-devel -BuildRequires: glibc-devel +BuildRequires: gnome-doc-utils-devel BuildRequires: intltool -%if %{undefined mdkversion} -BuildRequires: libbonobo-devel -BuildRequires: libgnomeui-devel -%endif -BuildRequires: libgsf-devel -BuildRequires: libidn-devel -BuildRequires: libuuid-devel -BuildRequires: pcre-devel -BuildRequires: perl-XML-Parser +BuildRequires: pkgconfig BuildRequires: scrollkeeper -BuildRequires: sword-devel > 1.6.2 -%if ( %{undefined centos_version} && 0%{?suse_version} != 1110 ) -BuildRequires: pkgconfig(cairo) +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(biblesync) >= 1.1.2 BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(gconf-2.0) 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 +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gtk+-unix-print-2.0) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(libgsf-1) >= 1.14 +BuildRequires: pkgconfig(libgtkhtml-4.0) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(sword) >= 1.7.3 +BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(webkit2gtk-4.0) 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 +Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -150,72 +62,40 @@ if you want to browse the Bible translations and reference works distributed by Crosswire Bible Society through the SWORD Project. +%lang_package + %prep -%setup -q -n xiphos-%{version} +%setup -q %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} --gtk=3 --enable-webkit-editor - %else -./waf configure --prefix=%{_prefix} --gtk=2 - %endif -%endif +./waf configure \ + --prefix=%{_prefix} \ + --enable-webkit2 \ + --gtk=3 ./waf build %install ./waf install --destdir=%{buildroot} - install -D -m 644 %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop -%if 0%{?suse_version} %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 - +# package docs with macro +rm -frv %{buildroot}/%{_datadir}/doc/%{name} install -Dm644 xiphos.1 %{buildroot}%{_mandir}/man1/xiphos.1 - +install -Dm644 xiphos-nav.1 %{buildroot}%{_mandir}/man1/xiphos-nav.1 +%fdupes -s %{buildroot}/%{_datadir} %find_lang %{name} -%if %{undefined fedora} -%fdupes -s %{buildroot} -%endif - -%clean -rm -rf %{buildroot} - %post -%if 0%{?suse_version} > 1130 %icon_theme_cache_post -%endif %postun -%if 0%{?suse_version} > 1130 %icon_theme_cache_postun -%endif -%files -f %{name}.lang +%files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README RELEASE-NOTES TODO TRANSLATION-HOWTO Xiphos.ogg +%doc COPYING README.md RELEASE-NOTES Xiphos.ogg %dir %{_datadir}/%{name} %{_bindir}/xiphos* %{_datadir}/xiphos/* @@ -225,10 +105,8 @@ %{_datadir}/appdata/xiphos.appdata.xml %{_mandir}/man1/* %dir %{_datadir}/omf -%if ( %{defined centos_version} || %{defined fedora} ) -%{_defaultdocdir}/%{name}/* -%{_datadir}/gnome/help/%{name}/* -%{_datadir}/omf/%{name}/* -%endif + +%files lang -f %{name}.lang +%defattr(-, root, root) %changelog ++++++ xiphos-4.0.4.tar.gz -> xiphos-4.0.6.tar.gz ++++++ /work/SRC/openSUSE:Factory/xiphos/xiphos-4.0.4.tar.gz /work/SRC/openSUSE:Factory/.xiphos.new/xiphos-4.0.6.tar.gz differ: char 4, line 1