Accepting request 535443 from GNOME:Next
This package cannot be noarch - as config.py contains info detected info, which is arch dependent OBS-URL: https://build.opensuse.org/request/show/535443 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk-doc?expand=0&rev=53
This commit is contained in:
parent
7fc4a17808
commit
f6ebdac743
47
gtk-doc-Generate-main-sgml.patch
Normal file
47
gtk-doc-Generate-main-sgml.patch
Normal file
@ -0,0 +1,47 @@
|
||||
From c08cc78562c59082fc83b55b58747177510b7a70 Mon Sep 17 00:00:00 2001
|
||||
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
||||
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
|
||||
|
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 20 09:08:01 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
- 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 - zaitor@opensuse.org
|
||||
|
||||
- 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.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 4 12:44:28 UTC 2017 - dimstar@opensuse.org
|
||||
|
||||
|
12
gtk-doc.spec
12
gtk-doc.spec
@ -23,10 +23,12 @@ Summary: GTK+ DocBook Documentation Generator
|
||||
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
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libxml2-tools
|
||||
BuildRequires: openjade
|
||||
BuildRequires: pkgconfig
|
||||
@ -47,7 +49,6 @@ Recommends: source-highlight
|
||||
# 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 +60,11 @@ generate the documentation for GLib, Gtk+, and GNOME.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%configure --disable-scrollkeeper
|
||||
autoreconf -fiv
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
@ -73,7 +76,6 @@ mv -v doc/README doc/doc.README
|
||||
%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
|
||||
|
Loading…
Reference in New Issue
Block a user