- updated to 1.26

- updated noarch patch
- removed obsolete gtk4 patch
- tools have been ported from perl to python
- SGML support has been dropped

diff --git a/gtk-doc-gtk4.patch b/gtk-doc-gtk4.patch
deleted file mode 100644 (file)
index ad73bf4..0000000
--- a/gtk-doc-gtk4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtk-doc-1.25/gtkdoc-scangobj.in.orig       2015-06-17 10:23:31.000000000 +0200
-+++ gtk-doc-1.25/gtkdoc-scangobj.in    2017-05-25 19:00:21.900251236 +0200
-@@ -1269,7 +1269,7 @@
- #endif
- 
- #ifdef GTK_IS_WIDGET_CLASS
--#if GTK_CHECK_VERSION(2,1,0)
-+#if GTK_CHECK_VERSION(2,1,0) && !GTK_CHECK_VERSION(3,89,2)
-     if (!style_prop && GTK_IS_WIDGET_CLASS (class)) {
-       properties = gtk_widget_class_list_style_properties (GTK_WIDGET_CLASS (class), &n_properties);
-       style_prop = TRUE;

diff --git a/gtk-doc-noarch.patch b/gtk-doc-noarch.patch
index a917f1e27ad65bfa755b798b724858c2a35bd343..3e87f17a265ef0c68817289c9c5510157bac9fb2 100644 (file)
--- a/gtk-doc-noarch.patch
+++ b/gtk-doc-noarch.patch
@@ -1,6 +1,6 @@
---- gtk-doc-1.22/configure.ac.noarch   2015-05-08 18:46:08.040460393 +0200
-+++ gtk-doc-1.22/configure.ac  2015-05-08 18:46:35.954031830 +0200
-@@ -24,10 +24,6 @@ AM_SILENT_RULES([yes])
+--- gtk-doc-1.26/configure.ac.orig     2017-08-11 10:01:46.000000000 +0200
++++ gtk-doc-1.26/configure.ac  2017-11-13 16:03:52.413461438 +0100
+@@ -24,10 +24,6 @@
  # Check for programs
  AC_PROG_CC
  
@@ -11,8 +11,8 @@
  dnl Make sure we have pkg-config >= 0.19, so installing in $(datadir) is OK.
  PKG_PROG_PKG_CONFIG([0.19])
  
-@@ -260,22 +256,6 @@ gtk-doc.cat
- gtkdoc-common.pl
+@@ -227,25 +223,6 @@
+ gtkdoc/config.py
  help/Makefile
  help/manual/Makefile
 -tests/Makefile
@@ -31,6 +31,9 @@
 -tests/empty/Makefile
 -tests/empty/src/Makefile
 -tests/empty/docs/Makefile
+-tests/program/Makefile
+-tests/program/src/Makefile
+-tests/program/docs/Makefile
  ])
  
  dnl run chmod on these after parsing them.

diff --git a/gtk-doc.spec b/gtk-doc.spec
index 8159f9ce6923f88afe1d9f9971425adfeff397c0..95c40b14262a0cb438d12aa46f48ff3d2fce036f 100644 (file)
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -3,33 +3,30 @@
 %bcond_with    tests   # build regression tests programs
 %bcond_without gnome   # build without gtk-doc-manual in GNOME help format
 #
-%include       /usr/lib/rpm/macros.perl
-#
 Summary:       API documentation generation tool for GTK+ and GNOME
 Summary(es.UTF-8):     El generador de documentación del GTK
 Summary(pl.UTF-8):     Narzędzie do generowania dokumentacji API do GTK+ i GNOME
 Summary(pt_BR.UTF-8):  O gerador de documentação do GTK
 Name:          gtk-doc
-Version:       1.25
-Release:       2
+Version:       1.26
+Release:       1
 License:       GPL v2+
 Group:         Development/Tools
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 0dc6570953112a464a409fb99258ccbc
+# Source0-md5: 1ad4a1dbf804889fdc85f8eec45e8696
 Patch0:                %{name}-noarch.patch
-Patch1:                %{name}-gtk4.patch
 URL:           http://www.gtk.org/gtk-doc/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake >= 1:1.11
 BuildRequires: docbook-dtd43-xml
 BuildRequires: docbook-style-xsl >= 1.74.0
 %{?with_tests:BuildRequires:   glib2-devel >= 1:2.6.0}
-%{?with_tests:BuildRequires:   libtool}
+%{?with_tests:BuildRequires:   libtool >= 2:2.2}
+BuildRequires: libxml2 >= 1:2.3.6
 BuildRequires: libxslt-progs >= 1.1.15
-BuildRequires: perl-base >= 1:5.18.0
 BuildRequires: pkgconfig >= 1:0.19
-BuildRequires: python >= 1:2.3
-BuildRequires: rpm-perlprov >= 4.1-13
+BuildRequires: python >= 1:2.7
+BuildRequires: python-six
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.446
@@ -38,12 +35,10 @@ BuildRequires:      xz
 %{?with_gnome:BuildRequires:   yelp-tools}
 Requires:      %{name}-automake = %{version}-%{release}
 Requires:      docbook-dtd43-xml
-Requires:      docbook-style-dsssl >= 1.77
 Requires:      docbook-style-xsl >= 1.74.0
-Requires:      docbook-utils >= 0.6.10
+Requires:      libxml2 >= 1:2.3.6
 Requires:      libxslt-progs >= 1.1.15
-Requires:      openjade
-Requires:      perl-base >= 1:5.18.0
+Requires:      python-six
 Requires:      source-highlight
 Conflicts:     pkgconfig < 1:0.19
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,6 +56,8 @@ Summary:      Automake macros for gtk-doc
 Summary(pl.UTF-8):     Makra automake'a do gtk-doc
 Group:         Development/Tools
 Requires:      automake
+Requires:      pkgconfig
+Conflicts:     glib2-devel < 1:2.10.0
 Conflicts:     gtk-doc < 0:1.4-3
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
@@ -91,7 +88,6 @@ pomocą gtk-doc.
 %prep
 %setup -q
 %{!?with_tests:%patch0 -p1}
-%patch1 -p1
 %{__mv} doc/README doc/README.docs
 
 %build
@@ -133,7 +129,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake
 %{_datadir}/gtk-doc
 %{_npkgconfigdir}/gtk-doc.pc
-%{_datadir}/sgml/%{name}
 %{_examplesdir}/%{name}-%{version}
 
 %files automake