Accepting request 794482 from GNOME:Factory

Resubmit - we need to get rid of that cycle; the glib update depends on this version of gtk-doc"

OBS-URL: https://build.opensuse.org/request/show/794482
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk-doc?expand=0&rev=44
This commit is contained in:
Dominique Leuenberger 2020-04-23 16:25:25 +00:00 committed by Git OBS Bridge
commit 569c699d5d
5 changed files with 137 additions and 26 deletions

3
_multibuild Normal file
View File

@ -0,0 +1,3 @@
<multibuild>
<package>doc</package>
</multibuild>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:14578e002496567276d310a62c9ffd6c56ee8806ce5079ffb0b81c4111f586b1
size 732376

3
gtk-doc-1.32.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c
size 762000

View File

@ -1,9 +1,55 @@
-------------------------------------------------------------------
Sat Jan 25 14:14:11 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- No longer recommend -lang: supplements are in use
-------------------------------------------------------------------
Thu Dec 19 12:28:32 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Revert building as noarch:
./python/gtkdoc/config.py:pkg_config = '/usr/bin/i586-suse-linux-gnu-pkg-config'
-------------------------------------------------------------------
Sun Dec 15 19:44:20 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Make package noarch, no binary files included.
- Move manual to separate subpackage, and build it using _multibuild.
Removes python3-libxml2 build dependency (via yelp-tools/itstool)
from main package.
- Correct license for documentation, it is GFDL-1.1-or-later.
- Stop packaging obsolete docs, replaced by the manual.
-------------------------------------------------------------------
Fri Nov 8 17:40:31 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Move gtkdoc-mkpdf to a separate package, pulling in the required
dblatex. Set dblatex path so configure puts it into config.py.
- Drop ChangeLog from doc (not updated since 2009), NEWS is sufficient.
- Update description, gtk-doc no longer uses perl but python.
- Spec file cleanup
-------------------------------------------------------------------
Mon Sep 2 18:59:35 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Remove openjade BuildRequires/Requires, SGML support was removed
in gtk-doc 1.25.
-------------------------------------------------------------------
Wed Aug 21 10:51:52 CEST 2019 - dimstar@opensuse.org
- Update to version 1.32:
+ Hotfix release.
- changes from version 1.31:
+ fix "Wrong permissions for style CSS file" (#84).
- Changes from version 1.30:
+ GTK-Doc is now using python-pygments to do the syntax
highlighing.
+ This version ships with a new expermiental gtkdoc-mkhtml2
toolchain replacing gktdoc-mkhtml+gtkdoc-fixxref.
- Add python3-pygments Requires: new dependency.
- Drop source-highlight recommends: no longer the used highlighting
tool.
-------------------------------------------------------------------
Tue Aug 28 23:41:17 UTC 2018 - bjorn.lie@gmail.com

View File

@ -1,7 +1,7 @@
#
# spec file for package gtk-doc
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,19 +12,33 @@
# 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/
#
Name: gtk-doc
Version: 1.29
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "doc"
%bcond_without doc
%define psuffix -manual
%else
%bcond_with doc
%endif
Name: gtk-doc%{?psuffix}
Version: 1.32
Release: 0
Summary: GTK+ DocBook Documentation Generator
%if "%{flavor}" == ""
Summary: GTK+ Documentation Generator
License: GPL-2.0-or-later
Group: Productivity/Publishing/SGML
%else
Summary: Manual for Gtkdoc
License: GFDL-1.1-or-later
Group: Documentation/HTML
%endif
URL: http://www.gtk.org/gtk-doc/
# When updating this package, please don't forget to update the gtk-doc.m4 Source in glib2.
Source0: https://download.gnome.org/sources/gtk-doc/1.29/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gtk-doc/1.32/gtk-doc-%{version}.tar.xz
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libtool
@ -32,53 +46,101 @@ BuildRequires: libxml2-tools
BuildRequires: pkgconfig
BuildRequires: python3-base
BuildRequires: sgml-skel
BuildRequires: xsltproc
%if %{with doc}
BuildRequires: fdupes
BuildRequires: yelp-tools
# gtk-doc-manual was split from the main package
Provides: gtk-doc:%{_datadir}/help/C/gtk-doc-manual/index.docbook
Conflicts: gtk-doc < %{version}-%{release}
Conflicts: gtk-doc-lang < %{version}-%{release}
%else
BuildRequires: xsltproc
Requires: docbook-xsl-stylesheets
Requires: docbook_4
Requires: glib2-devel
Requires: libxml2-tools
Requires: python3-pygments
Requires: xsltproc
Recommends: %{name}-lang
Recommends: source-highlight
Recommends: gtk-doc-manual
# Old for <= 10.2 & CODE10
Provides: gtkdoc = %{version}
Obsoletes: gtkdoc
%endif
%if "%{flavor}" == ""
%description
Gtkdoc is a set of Perl scripts that generate API reference
documentation in DocBook format. It can extract documentation from
source code comments in a manner similar to Java-doc. It is used to
generate the documentation for GLib, Gtk+, and GNOME.
Gtkdoc is a set of Python scripts that generates API reference
documentation in e.g DocBook, HTML or PDF format. It can extract
documentation from source code comments in a manner similar to
Java-doc. It is used to generate the documentation for GLib,
Gtk+, and GNOME.
%lang_package
%else
%description
User manual for Gtkdoc
%endif
%package mkpdf
Summary: Gtkdoc PDF Generator
Supplements: packageand(gtk-doc:dblatex)
Requires: %{name} = %{version}
Requires: dblatex
%description mkpdf
PDF generator for Gtkdoc.
%lang_package -n gtk-doc-manual
%prep
%autosetup -p1
%autosetup -p1 -n gtk-doc-%{version}
%build
%configure PYTHON=%{_bindir}/python3
autoreconf
%configure PYTHON=%{_bindir}/python3 \
DBLATEX=%{_bindir}/dblatex
make %{?_smp_mflags}
%install
%if "%{flavor}" == ""
%make_install
# Do not install the cmake files for now - they need more clarification (1.25)
rm -rf %{buildroot}%{_libdir}/cmake
mkdir -p %{buildroot}%{_datadir}/gtk-doc/html
mv -v doc/README doc/doc.README
%find_lang %{name}-manual %{?no_lang_C}
%endif
%if %{with doc}
%make_install -C help
%fdupes %{buildroot}%{_datadir}/help/[a-z]*
%find_lang gtk-doc-manual %{?no_lang_C}
%endif
%if "%{flavor}" == ""
%files
%license COPYING
%doc AUTHORS COPYING-DOCS ChangeLog NEWS README TODO doc/*
%doc AUTHORS NEWS README TODO
%{_bindir}/gtkdoc-*
%{_bindir}/gtkdocize
%exclude %{_bindir}/gtkdoc-mkpdf
%dir %{_datadir}/aclocal
%{_datadir}/aclocal/gtk-doc.m4
%{_datadir}/gtk-doc/
%exclude %{_datadir}/gtk-doc/python/gtkdoc/mkpdf*
%{_datadir}/pkgconfig/gtk-doc.pc
%doc %{_datadir}/help/C/gtk-doc-manual/
%dir %{_datadir}/cmake
%dir %{_datadir}/cmake/GtkDoc
%{_datadir}/cmake/GtkDoc/GtkDocConfig.cmake
%{_datadir}/cmake/GtkDoc/GtkDocConfigVersion.cmake
%{_datadir}/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake
%files lang -f %{name}-manual.lang
%files mkpdf
%{_bindir}/gtkdoc-mkpdf
%{_datadir}/gtk-doc/python/gtkdoc/mkpdf*
%endif
%if %{with doc}
%files -n gtk-doc-manual
%license COPYING-DOCS
%doc %{_datadir}/help/C/gtk-doc-manual
%files -n gtk-doc-manual-lang -f gtk-doc-manual.lang
%endif
%changelog