- updated to 1.18

Changed files:
    gtk-doc-noarch.patch -> 1.4
    gtk-doc.spec -> 1.89

diff --git a/gtk-doc-noarch.patch b/gtk-doc-noarch.patch
index 97c661cf237862dd4423c971cda997a63a75d208..1d861f4f0132e3b8d4a0c47b93012d924ae14642 100644 (file)
--- a/gtk-doc-noarch.patch
+++ b/gtk-doc-noarch.patch
@@ -1,15 +1,18 @@
-diff -urN gtk-doc-1.14/configure.ac gtk-doc-1.14.new//configure.ac
---- gtk-doc-1.14/configure.ac  2010-01-03 13:11:00.000000000 +0100
-+++ gtk-doc-1.14.new//configure.ac     2010-03-29 16:31:44.160813374 +0200
-@@ -27,7 +27,6 @@
- 
- AC_ISC_POSIX
+diff -urN gtk-doc-1.18/configure.ac gtk-doc-1.18.new/configure.ac
+--- gtk-doc-1.18/configure.ac  2011-09-14 15:51:12.000000000 +0200
++++ gtk-doc-1.18.new/configure.ac      2011-09-21 21:01:47.021454469 +0200
+@@ -28,10 +28,6 @@
+ # Check for programs
  AC_PROG_CC
--AC_PROG_LIBTOOL
  
+-# Initialize libtool
+-LT_PREREQ([2.2])
+-LT_INIT
+-
  dnl Make sure we have pkg-config >= 0.19, so installing in $(datadir) is OK.
  PKG_PROG_PKG_CONFIG([0.19])
-@@ -185,23 +184,6 @@
+ 
+@@ -221,23 +217,6 @@
  gtkdoc-common.pl
  help/Makefile
  help/manual/Makefile
@@ -33,12 +36,12 @@ diff -urN gtk-doc-1.14/configure.ac gtk-doc-1.14.new//configure.ac
  ])
  
  dnl run chmod on these after parsing them.
-diff -urN gtk-doc-1.14/Makefile.am gtk-doc-1.14.new//Makefile.am
---- gtk-doc-1.14/Makefile.am   2009-12-18 09:17:37.000000000 +0100
-+++ gtk-doc-1.14.new//Makefile.am      2010-03-29 16:32:00.657469792 +0200
+diff -urN gtk-doc-1.18/Makefile.am gtk-doc-1.18.new/Makefile.am
+--- gtk-doc-1.18/Makefile.am   2011-06-17 10:39:37.000000000 +0200
++++ gtk-doc-1.18.new/Makefile.am       2011-09-21 21:01:51.870518213 +0200
 @@ -1,7 +1,7 @@
  ## Process this file with automake to produce Makefile.in
- ACLOCAL_AMFLAGS=-I m4
+ ACLOCAL_AMFLAGS=-I m4 ${ACLOCAL_FLAGS}
  
 -SUBDIRS = help tests
 +SUBDIRS = help

diff --git a/gtk-doc.spec b/gtk-doc.spec
index 99b7885bdd6a952ad273ec81441bcdb6d0db234d..8e03c375f0c0e87edc051bf95ca5b775a93df9ec 100644 (file)
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -10,16 +10,16 @@ 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.17
+Version:       1.18
 Release:       1
 License:       GPL v2+
 Group:         Development/Tools
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.17/%{name}-%{version}.tar.bz2
-# Source0-md5: ca52ca10845089da6966d810709d4ee3
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/1.18/%{name}-%{version}.tar.xz
+# Source0-md5: 3927bed60fdd0fc9093a1d00018e746a
 Patch0:                %{name}-noarch.patch
 URL:           http://www.gtk.org/rdp/
-BuildRequires: autoconf >= 2.58
-BuildRequires: automake
+BuildRequires: autoconf >= 2.63
+BuildRequires: automake >= 1:1.11
 BuildRequires: docbook-dtd412-xml >= 1.0-10
 BuildRequires: docbook-dtd43-xml
 BuildRequires: docbook-style-xsl >= 1.74.0
@@ -36,6 +36,8 @@ BuildRequires:        rpm-perlprov >= 4.1-13
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: scrollkeeper >= 1:0.3.5
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 Requires(post,postun): scrollkeeper
 Requires:      %{name}-automake = %{version}-%{release}
 Requires:      docbook-dtd43-xml