Hello community, here is the log from the commit of package florence for openSUSE:Factory checked in at 2019-07-11 13:18:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/florence (Old) and /work/SRC/openSUSE:Factory/.florence.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "florence" Thu Jul 11 13:18:00 2019 rev:8 rq:714373 version:0.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/florence/florence.changes 2018-05-18 14:27:52.406435673 +0200 +++ /work/SRC/openSUSE:Factory/.florence.new.4615/florence.changes 2019-07-11 13:18:33.314764333 +0200 @@ -1,0 +2,8 @@ +Tue Jul 9 20:16:45 UTC 2019 - Bjørn Lie <bjorn....@gmail.com> + +- Add florence-build-without-scrollkeeper.patch : Fix build without + scrollkeeper support, following this patch, drop + rarian-scrollkeeper-compat BuildRequires and stop passing + --disable-scrollkeeper to configure, no longer needed nor used. + +------------------------------------------------------------------- New: ---- florence-build-without-scrollkeeper.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ florence.spec ++++++ --- /var/tmp/diff_new_pack.pjvvov/_old 2019-07-11 13:18:35.278763714 +0200 +++ /var/tmp/diff_new_pack.pjvvov/_new 2019-07-11 13:18:35.302763706 +0200 @@ -1,7 +1,7 @@ # # spec file for package florence # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,7 +12,7 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -31,10 +31,12 @@ Patch1: florence-implicit-definitions.patch # PATCH-FIX-UPSTREAM florence-buildfix.patch dims...@opensuse.org -- Fix build system: link libflorence-1.0.la Patch2: florence-buildfix.patch +# PATCH-FIX-UPSTREAM florence-build-without-scrollkeeper.patch -- Fix build without scrollkeeper +Patch3: florence-build-without-scrollkeeper.patch + BuildRequires: intltool BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: rarian-scrollkeeper-compat BuildRequires: update-desktop-files BuildRequires: pkgconfig(atspi-2) BuildRequires: pkgconfig(cairo) @@ -92,11 +94,11 @@ %patch0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoreconf -fiv %configure \ - --disable-scrollkeeper \ --disable-static make %{?_smp_mflags} @@ -124,9 +126,6 @@ %doc AUTHORS ChangeLog COPYING-DOCS NEWS README %dir %{_datadir}/gnome/help/%{name} %doc %{_datadir}/gnome/help/%{name}/C/ -%dir %{_datadir}/omf -%dir %{_datadir}/omf/%{name} -%doc %{_datadir}/omf/%{name}/%{name}-C.omf %{_mandir}/man1/%{name}.1%{?ext_man} %{_mandir}/man1/%{name}_applet.1%{?ext_man} %{_bindir}/%{name} ++++++ florence-build-without-scrollkeeper.patch ++++++ From: Jeremy Bicha <jbi...@debian.org> Date: Sun, 21 Oct 2018 17:07:18 -0400 Subject: build without scrollkeeper --- configure.ac | 8 -------- docs/florence.omf.in | 12 ------------ 2 files changed, 20 deletions(-) delete mode 100644 docs/florence.omf.in diff --git a/configure.ac b/configure.ac index 7fe6208..db23aa3 100755 --- a/configure.ac +++ b/configure.ac @@ -51,14 +51,6 @@ GNOME_DOC_INIT(,, if test "x$with_docs" != "xno"; then AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found]) fi) -if test "x$with_docs" != "xno"; then - AC_PATH_PROG(SK_CONFIG,scrollkeeper-config,no) - if test x$SK_CONFIG = xno; then - AC_MSG_ERROR(Couldn't find scrollkeeper-config. Please install the scrollkeeper package: http://scrollkeeper.sourceforge.net) - fi - SCROLLKEEPER_BUILD_REQUIRED=0.3.5 - AC_SUBST(SCROLLKEEPER_BUILD_REQUIRED) -fi # Checks for libraries. DEP_MODULES="xext gmodule-2.0 cairo librsvg-2.0 libxml-2.0 gstreamer-1.0" diff --git a/docs/florence.omf.in b/docs/florence.omf.in deleted file mode 100644 index ecef901..0000000 --- a/docs/florence.omf.in +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<omf> - <resource> - <date>@DATE@</date> - <subject category="GNOME|Accessibility"/> - <type>user's guide</type> - <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/> - <relation seriesid="de2bf600-264f-11dd-81e2-d141ac518859"/> - <rights type="GNU FDL" license.version="1.2" holder="François Agrech"/> - </resource> -</omf> -
