[packages/gtk-doc] Update to 1.25

[megabajt]

commit 0713dce70552689bb19c4486dba8f407a9989454
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date:   Tue Mar 22 20:04:00 2016 +0100

    Update to 1.25
    
    - main package is no longer noarch

 gtk-doc-noarch.patch |  4 ++--
 gtk-doc.spec         | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/gtk-doc.spec b/gtk-doc.spec
index 293242b..b2d70a4 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -10,12 +10,12 @@ 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.24
+Version:	1.25
 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:	a8b96bacaba04e83531abf8e36d4e476
+# Source0-md5:	0dc6570953112a464a409fb99258ccbc
 Patch0:		%{name}-noarch.patch
 URL:		http://www.gtk.org/rdp/
 BuildRequires:	autoconf >= 2.63
@@ -25,7 +25,7 @@ BuildRequires:	docbook-style-xsl >= 1.74.0
 %{?with_tests:BuildRequires:	glib2-devel >= 1:2.6.0}
 %{?with_tests:BuildRequires:	libtool}
 BuildRequires:	libxslt-progs >= 1.1.15
-BuildRequires:	perl-base >= 1:5.6.0
+BuildRequires:	perl-base >= 1:5.18.0
 BuildRequires:	pkgconfig >= 1:0.19
 BuildRequires:	python >= 1:2.3
 BuildRequires:	rpm-perlprov >= 4.1-13
@@ -44,7 +44,6 @@ Requires:	libxslt-progs >= 1.1.15
 Requires:	openjade
 Requires:	source-highlight
 Conflicts:	pkgconfig < 1:0.19
-%{!?with_tests:BuildArch:	noarch}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -61,6 +60,9 @@ Summary(pl.UTF-8):	Makra automake'a do gtk-doc
 Group:		Development/Tools
 Requires:	automake
 Conflicts:	gtk-doc < 0:1.4-3
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description automake
 Automake macros for gtk-doc.
@@ -72,6 +74,9 @@ Makra automake'a do gtk-doc.
 Summary:	Common directories for documetation generated using gtk-doc
 Summary(pl.UTF-8):	Katalogi na dokumentację wygenerowaną za pomocą gtk-doc
 Group:		Development
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description common
 Common directories for API documentation for various packages,
@@ -119,6 +124,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog MAINTAINERS NEWS TODO README doc/*
 %attr(755,root,root) %{_bindir}/gtkdoc-*
 %attr(755,root,root) %{_bindir}/gtkdocize
+%dir %{_libdir}/cmake/GtkDoc
+%{_libdir}/cmake/GtkDoc/GtkDocConfig.cmake
+%{_libdir}/cmake/GtkDoc/GtkDocConfigVersion.cmake
+%{_libdir}/cmake/GtkDoc/GtkDocScanGObjWrapper.cmake
 %{_datadir}/gtk-doc
 %{_npkgconfigdir}/gtk-doc.pc
 %{_datadir}/sgml/%{name}
diff --git a/gtk-doc-noarch.patch b/gtk-doc-noarch.patch
index 6a6076e..a917f1e 100644
--- a/gtk-doc-noarch.patch
+++ b/gtk-doc-noarch.patch
@@ -40,8 +40,8 @@
  ## Process this file with automake to produce Makefile.in
  ACLOCAL_AMFLAGS=-I m4 ${ACLOCAL_FLAGS}
  
--SUBDIRS = help tests
-+SUBDIRS = help
+-SUBDIRS = cmake help tests
++SUBDIRS = cmake help
  
  bin_SCRIPTS = \
  	gtkdoc-check    \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gtk-doc.git/commitdiff/0713dce70552689bb19c4486dba8f407a9989454