From 1c9b2991b7c070073d6f9ed300e0003d8e2bc9993f86d3024d8a21232a40b581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 4 Oct 2019 15:51:13 +0000 Subject: [PATCH 1/6] Accepting request 735079 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/735079 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk-doc?expand=0&rev=70 --- gtk-doc-1.29.tar.xz | 3 --- gtk-doc-1.32.tar.xz | 3 +++ gtk-doc.changes | 16 ++++++++++++++++ gtk-doc.spec | 16 +++++++++++----- 4 files changed, 30 insertions(+), 8 deletions(-) delete mode 100644 gtk-doc-1.29.tar.xz create mode 100644 gtk-doc-1.32.tar.xz diff --git a/gtk-doc-1.29.tar.xz b/gtk-doc-1.29.tar.xz deleted file mode 100644 index 5b04b85..0000000 --- a/gtk-doc-1.29.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14578e002496567276d310a62c9ffd6c56ee8806ce5079ffb0b81c4111f586b1 -size 732376 diff --git a/gtk-doc-1.32.tar.xz b/gtk-doc-1.32.tar.xz new file mode 100644 index 0000000..9fe474f --- /dev/null +++ b/gtk-doc-1.32.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c +size 762000 diff --git a/gtk-doc.changes b/gtk-doc.changes index 7935204..55572e6 100644 --- a/gtk-doc.changes +++ b/gtk-doc.changes @@ -4,6 +4,22 @@ Mon Sep 2 18:59:35 UTC 2019 - Stefan Brüns - 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 (Build)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 diff --git a/gtk-doc.spec b/gtk-doc.spec index 0bd2ead..fcbdd7b 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -1,7 +1,7 @@ # # spec file for package gtk-doc # -# 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,25 +12,26 @@ # 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 +Version: 1.32 Release: 0 Summary: GTK+ DocBook Documentation Generator License: GPL-2.0-or-later 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. -Source0: https://download.gnome.org/sources/gtk-doc/1.29/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gtk-doc/1.32/%{name}-%{version}.tar.xz BuildRequires: docbook-xsl-stylesheets BuildRequires: libtool BuildRequires: libxml2-tools BuildRequires: pkgconfig BuildRequires: python3-base +BuildRequires: python3-pygments BuildRequires: sgml-skel BuildRequires: xsltproc BuildRequires: yelp-tools @@ -38,9 +39,9 @@ Requires: docbook-xsl-stylesheets Requires: docbook_4 Requires: glib2-devel Requires: libxml2-tools +Requires: python3-pygments Requires: xsltproc Recommends: %{name}-lang -Recommends: source-highlight # Old for <= 10.2 & CODE10 Provides: gtkdoc = %{version} Obsoletes: gtkdoc @@ -78,6 +79,11 @@ mv -v doc/README doc/doc.README %{_datadir}/gtk-doc/ %{_datadir}/pkgconfig/gtk-doc.pc %doc %{_datadir}/help/C/gtk-doc-manual/ +%dir /usr/share/cmake +%dir /usr/share/cmake/GtkDoc +/usr/share/cmake/GtkDoc/GtkDocConfig.cmake +/usr/share/cmake/GtkDoc/GtkDocConfigVersion.cmake +/usr/share/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake %files lang -f %{name}-manual.lang From ed6a3c904a89943c5a4f68dc045233b54c44cee46a162aeb63b91d64a271c66f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 12 Nov 2019 12:08:10 +0000 Subject: [PATCH 2/6] Accepting request 746671 from home:StefanBruens:branches:GNOME:Factory Fix broken gtkdoc-mkpdf (config.dblatex not set in config.py). - 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 OBS-URL: https://build.opensuse.org/request/show/746671 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk-doc?expand=0&rev=71 --- gtk-doc.changes | 9 +++++++++ gtk-doc.spec | 45 ++++++++++++++++++++++++++++++--------------- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/gtk-doc.changes b/gtk-doc.changes index 55572e6..f051a2f 100644 --- a/gtk-doc.changes +++ b/gtk-doc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Nov 8 17:40:31 UTC 2019 - Stefan Brüns + +- 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 diff --git a/gtk-doc.spec b/gtk-doc.spec index fcbdd7b..753a276 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -19,7 +19,7 @@ Name: gtk-doc Version: 1.32 Release: 0 -Summary: GTK+ DocBook Documentation Generator +Summary: GTK+ Documentation Generator License: GPL-2.0-or-later Group: Productivity/Publishing/SGML URL: http://www.gtk.org/gtk-doc/ @@ -47,10 +47,20 @@ Provides: gtkdoc = %{version} Obsoletes: gtkdoc %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. + +%package mkpdf +Summary: Gtkdoc PDF Generator +Supplements: packageand(gtk-doc:dblatex) +Requires: %{name} = %{version} +Requires: dblatex + +%description mkpdf +PDF generator for Gtkdoc. %lang_package @@ -58,32 +68,37 @@ generate the documentation for GLib, Gtk+, and GNOME. %autosetup -p1 %build -%configure PYTHON=%{_bindir}/python3 +%configure PYTHON=%{_bindir}/python3 \ + DBLATEX=%{_bindir}/dblatex make %{?_smp_mflags} %install %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} %files -%license COPYING -%doc AUTHORS COPYING-DOCS ChangeLog NEWS README TODO doc/* +%license COPYING COPYING-DOCS +%doc AUTHORS NEWS README TODO doc/* %{_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 /usr/share/cmake -%dir /usr/share/cmake/GtkDoc -/usr/share/cmake/GtkDoc/GtkDocConfig.cmake -/usr/share/cmake/GtkDoc/GtkDocConfigVersion.cmake -/usr/share/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake +%dir %{_datadir}/cmake +%dir %{_datadir}/cmake/GtkDoc +%{_datadir}/cmake/GtkDoc/GtkDocConfig.cmake +%{_datadir}/cmake/GtkDoc/GtkDocConfigVersion.cmake +%{_datadir}/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake + +%files mkpdf +%{_bindir}/gtkdoc-mkpdf +%{_datadir}/gtk-doc/python/gtkdoc/mkpdf* %files lang -f %{name}-manual.lang From dd87e6411cb3bc886d2c027378024c2dd999e15ccfc7a98046412bcdbed4eca4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 16 Dec 2019 12:52:55 +0000 Subject: [PATCH 3/6] Accepting request 757203 from home:StefanBruens:branches:GNOME:Factory - 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. OBS-URL: https://build.opensuse.org/request/show/757203 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk-doc?expand=0&rev=72 --- _multibuild | 3 +++ gtk-doc.changes | 10 +++++++ gtk-doc.spec | 72 +++++++++++++++++++++++++++++++++++++++---------- 3 files changed, 71 insertions(+), 14 deletions(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..58ef5ee --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + doc + diff --git a/gtk-doc.changes b/gtk-doc.changes index f051a2f..d003229 100644 --- a/gtk-doc.changes +++ b/gtk-doc.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Dec 15 19:44:20 UTC 2019 - Stefan Brüns + +- 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 diff --git a/gtk-doc.spec b/gtk-doc.spec index 753a276..d517d52 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -1,7 +1,7 @@ # # spec file for package gtk-doc # -# Copyright (c) 2019 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 @@ -16,36 +16,61 @@ # -Name: gtk-doc +%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 +%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.32/%{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 BuildRequires: libxml2-tools BuildRequires: pkgconfig BuildRequires: python3-base -BuildRequires: python3-pygments 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} +Recommends: gtk-doc-manual-lang +%else +BuildRequires: python3-pygments +BuildRequires: xsltproc Requires: docbook-xsl-stylesheets Requires: docbook_4 Requires: glib2-devel Requires: libxml2-tools Requires: python3-pygments Requires: xsltproc -Recommends: %{name}-lang +Recommends: gtk-doc-manual # Old for <= 10.2 & CODE10 Provides: gtkdoc = %{version} Obsoletes: gtkdoc +%endif +BuildArch: noarch +%if "%{flavor}" == "" %description Gtkdoc is a set of Python scripts that generates API reference documentation in e.g DocBook, HTML or PDF format. It can extract @@ -53,6 +78,11 @@ documentation from source code comments in a manner similar to Java-doc. It is used to generate the documentation for GLib, Gtk+, and GNOME. +%else +%description +User manual for Gtkdoc +%endif + %package mkpdf Summary: Gtkdoc PDF Generator Supplements: packageand(gtk-doc:dblatex) @@ -62,25 +92,33 @@ Requires: dblatex %description mkpdf PDF generator for Gtkdoc. -%lang_package +%lang_package -n gtk-doc-manual %prep -%autosetup -p1 +%autosetup -p1 -n gtk-doc-%{version} %build +autoreconf %configure PYTHON=%{_bindir}/python3 \ DBLATEX=%{_bindir}/dblatex make %{?_smp_mflags} %install +%if "%{flavor}" == "" %make_install 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 COPYING-DOCS -%doc AUTHORS NEWS README TODO doc/* +%license COPYING +%doc AUTHORS NEWS README TODO %{_bindir}/gtkdoc-* %{_bindir}/gtkdocize %exclude %{_bindir}/gtkdoc-mkpdf @@ -89,7 +127,6 @@ mv -v doc/README doc/doc.README %{_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 @@ -99,7 +136,14 @@ mv -v doc/README doc/doc.README %files mkpdf %{_bindir}/gtkdoc-mkpdf %{_datadir}/gtk-doc/python/gtkdoc/mkpdf* +%endif -%files lang -f %{name}-manual.lang +%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 From 9ae618211d9b7c9774b430f9b70cb57cb74f450670f8fc7d1ed33226e3ebcb1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Thu, 19 Dec 2019 19:34:01 +0000 Subject: [PATCH 4/6] Accepting request 758177 from GNOME:Next - Revert building as noarch: ./python/gtkdoc/config.py:pkg_config = '/usr/bin/i586-suse-linux-gnu-pkg-config' OBS-URL: https://build.opensuse.org/request/show/758177 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk-doc?expand=0&rev=73 --- gtk-doc.changes | 6 ++++++ gtk-doc.spec | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gtk-doc.changes b/gtk-doc.changes index d003229..76bacd5 100644 --- a/gtk-doc.changes +++ b/gtk-doc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Dec 19 12:28:32 UTC 2019 - Dominique Leuenberger + +- 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 diff --git a/gtk-doc.spec b/gtk-doc.spec index d517d52..1f369f9 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -68,7 +68,6 @@ Recommends: gtk-doc-manual Provides: gtkdoc = %{version} Obsoletes: gtkdoc %endif -BuildArch: noarch %if "%{flavor}" == "" %description From d65802660276e0f0a5534376967523acafa767c24f10b0a70db28c57374950bb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 10 Jan 2020 23:53:10 +0000 Subject: [PATCH 5/6] Accepting request 762945 from GNOME:Next - Add python3-pygments Requires: new dependency. OBS-URL: https://build.opensuse.org/request/show/762945 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk-doc?expand=0&rev=74 --- gtk-doc.changes | 2 +- gtk-doc.spec | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/gtk-doc.changes b/gtk-doc.changes index 76bacd5..2f8802c 100644 --- a/gtk-doc.changes +++ b/gtk-doc.changes @@ -41,7 +41,7 @@ Wed Aug 21 10:51:52 CEST 2019 - dimstar@opensuse.org highlighing. + This version ships with a new expermiental gtkdoc-mkhtml2 toolchain replacing gktdoc-mkhtml+gtkdoc-fixxref. -- Add python3-pygments (Build)Requires: new dependency. +- Add python3-pygments Requires: new dependency. - Drop source-highlight recommends: no longer the used highlighting tool. diff --git a/gtk-doc.spec b/gtk-doc.spec index 1f369f9..e2e6869 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -55,7 +55,6 @@ Conflicts: gtk-doc < %{version}-%{release} Conflicts: gtk-doc-lang < %{version}-%{release} Recommends: gtk-doc-manual-lang %else -BuildRequires: python3-pygments BuildRequires: xsltproc Requires: docbook-xsl-stylesheets Requires: docbook_4 From 2f4a05c6e7c3280580ef19c024e960955692800045eb64dd4fa0956beaca0e75 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 26 Jan 2020 14:48:34 +0000 Subject: [PATCH 6/6] Accepting request 767166 from GNOME:Next Eliminate the -lang recommends OBS-URL: https://build.opensuse.org/request/show/767166 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk-doc?expand=0&rev=75 --- gtk-doc.changes | 5 +++++ gtk-doc.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gtk-doc.changes b/gtk-doc.changes index 2f8802c..84e4c70 100644 --- a/gtk-doc.changes +++ b/gtk-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 25 14:14:11 UTC 2020 - Dominique Leuenberger + +- No longer recommend -lang: supplements are in use + ------------------------------------------------------------------- Thu Dec 19 12:28:32 UTC 2019 - Dominique Leuenberger diff --git a/gtk-doc.spec b/gtk-doc.spec index e2e6869..f0baf61 100644 --- a/gtk-doc.spec +++ b/gtk-doc.spec @@ -53,7 +53,6 @@ BuildRequires: yelp-tools Provides: gtk-doc:%{_datadir}/help/C/gtk-doc-manual/index.docbook Conflicts: gtk-doc < %{version}-%{release} Conflicts: gtk-doc-lang < %{version}-%{release} -Recommends: gtk-doc-manual-lang %else BuildRequires: xsltproc Requires: docbook-xsl-stylesheets