Hello community, here is the log from the commit of package gtk-doc for openSUSE:Factory checked in at 2017-11-02 10:24:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk-doc (Old) and /work/SRC/openSUSE:Factory/.gtk-doc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk-doc" Thu Nov 2 10:24:05 2017 rev:37 rq:537591 version:1.26 Changes: -------- --- /work/SRC/openSUSE:Factory/gtk-doc/gtk-doc.changes 2017-09-13 21:41:54.376511133 +0200 +++ /work/SRC/openSUSE:Factory/.gtk-doc.new/gtk-doc.changes 2017-11-02 10:24:04.904790859 +0100 @@ -1,0 +2,25 @@ +Tue Oct 24 14:40:59 UTC 2017 - [email protected] + +- Switch to python3: add PYTHON=%{_bindir}/python3 to configure. +- Add: gtk-doc-open-docs-as-utf8.patch: Always open files using + utf-8. In python3, strings are differently represented + internally. + +------------------------------------------------------------------- +Fri Oct 20 09:08:01 UTC 2017 - [email protected] + +- Do not build as noarch: + /usr/share/gtk-doc/python/gtkdoc/config.py contains a full path + reference to $arch-pkg-config. + +------------------------------------------------------------------- +Tue Oct 10 22:00:57 UTC 2017 - [email protected] + +- Add gtk-doc-Generate-main-sgml.patch: Generate main sgml file by + waiting on mkdb. Fix first time parallel builds (bgo#786174). +- Following the above, add libtool BuildRequires and pass + autoreconf as the above patch touches the buildsystem. +- No longer pass --disable-scrollkeeper to configure, no longer + needed, nor recognized by configure. + +------------------------------------------------------------------- New: ---- gtk-doc-Generate-main-sgml.patch gtk-doc-open-docs-as-utf8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk-doc.spec ++++++ --- /var/tmp/diff_new_pack.Z8gMtj/_old 2017-11-02 10:24:05.412772345 +0100 +++ /var/tmp/diff_new_pack.Z8gMtj/_new 2017-11-02 10:24:05.412772345 +0100 @@ -23,14 +23,18 @@ License: GPL-2.0+ Group: Productivity/Publishing/SGML Url: http://www.gtk.org/gtk-doc/ +# When updating this package, please don't forget to update the gtk-doc.m4 Source in glib2. Source: https://download.gnome.org/sources/gtk-doc/1.26/%{name}-%{version}.tar.xz -# When updating this package, please don't forget to update the gtk-doc.m4 Source -# in glib2. +# PATCH-FIX-UPSTREAM gtk-doc-Generate-main-sgml.patch bgo#786174 -- Generate main sgml file by waiting on mkdb +Patch0: gtk-doc-Generate-main-sgml.patch +# PATCH-FIX-UPSTREAM gtk-doc-open-docs-as-utf8.patch [email protected] -- Always open files using utf-8 +Patch1: gtk-doc-open-docs-as-utf8.patch BuildRequires: docbook-xsl-stylesheets +BuildRequires: libtool BuildRequires: libxml2-tools BuildRequires: openjade BuildRequires: pkgconfig -BuildRequires: python-base +BuildRequires: python3-base BuildRequires: sgml-skel BuildRequires: xsltproc BuildRequires: yelp-tools @@ -39,7 +43,6 @@ Requires: glib2-devel Requires: libxml2-tools Requires: openjade -Requires: python-six Requires: python3-six Requires: xsltproc Recommends: %{name}-lang @@ -47,7 +50,6 @@ # Old for <= 10.2 & CODE10 Provides: gtkdoc = %{version} Obsoletes: gtkdoc -BuildArch: noarch %description Gtkdoc is a set of Perl scripts that generate API reference @@ -59,9 +61,12 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build -%configure --disable-scrollkeeper +autoreconf -fiv +%configure PYTHON=%{_bindir}/python3 make %{?_smp_mflags} %install @@ -73,7 +78,6 @@ %find_lang %{name}-manual %{?no_lang_C} %files -%defattr(-,root,root) %doc AUTHORS COPYING COPYING-DOCS ChangeLog NEWS README TODO doc/* %{_bindir}/gtkdoc-* %{_bindir}/gtkdocize ++++++ gtk-doc-Generate-main-sgml.patch ++++++ >From c08cc78562c59082fc83b55b58747177510b7a70 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <[email protected]> Date: Fri, 11 Aug 2017 21:06:59 +0200 Subject: gtk-doc.make: Generate main sgml file by waiting on mkdb The 'empty' test fails on some machines when doing a parallel build, as make cannot find tester-docs.xml. Add a rule to ensure make waits for gtkdoc-mkdb to generate the file. This will also fix first time parallel builds. https://bugzilla.gnome.org/show_bug.cgi?id=786174 --- gtk-doc.make | 3 +++ tests/gtk-doc.make | 3 +++ 2 files changed, 6 insertions(+) diff --git a/gtk-doc.make b/gtk-doc.make index e5777b6..d2a8b33 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -152,6 +152,9 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HF sgml.stamp: sgml-build.stamp @true +$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + xml/gtkdocentities.ent: Makefile $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ echo "<!ENTITY package \"$(PACKAGE)\">"; \ diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make index 808fda4..cb8e164 100644 --- a/tests/gtk-doc.make +++ b/tests/gtk-doc.make @@ -141,6 +141,9 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HF sgml.stamp: sgml-build.stamp @true +$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + xml/gtkdocentities.ent: Makefile @$(MKDIR_P) $(@D) && ( \ echo "<!ENTITY package \"$(PACKAGE)\">"; \ -- cgit v0.12 ++++++ gtk-doc-open-docs-as-utf8.patch ++++++ ++++ 626 lines (skipped)
