From 23a2631a98073c7074330ec432fde922dbdeb26e Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 17 Feb 2014 10:27:41 +0000
Subject: [PATCH] Update to 1.20

---
 .gitignore                                    |  1 +
 ...oc-mkdb-sort-entries-in-the-glossary.patch | 31 -------------------
 gtk-doc.spec                                  | 12 +++----
 sources                                       |  2 +-
 4 files changed, 8 insertions(+), 38 deletions(-)
 delete mode 100644 0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch

diff --git a/.gitignore b/.gitignore
index 63f0675..b1ea646 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gtk-doc-1.15.tar.bz2
 /gtk-doc-1.18.tar.xz
 /gtk-doc-1_18-87-gdf075f.tar.gz
 /gtk-doc-1.19.tar.xz
+/gtk-doc-1.20.tar.xz
diff --git a/0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch b/0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch
deleted file mode 100644
index 39ebf65..0000000
--- a/0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bd2b3769684a7f7ebdee1d32c0fe280ef0e75e86 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Mon, 21 Oct 2013 15:52:08 -0400
-Subject: [PATCH] gtkdoc-mkdb: sort entries in the glossary
-
-The entries in the glossary were in pseudo-random order, varying
-even between gtk-doc runs.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711111
-
-https://bugzilla.gnome.org/show_bug.cgi?id=711112
----
- gtkdoc-mkdb.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtkdoc-mkdb.in b/gtkdoc-mkdb.in
-index e448ed7..faffaf4 100755
---- a/gtkdoc-mkdb.in
-+++ b/gtkdoc-mkdb.in
-@@ -1119,7 +1119,7 @@ $header
-   <title>Annotation Glossary</title>
- EOF
- 
--    foreach my $annotation (keys(%AnnotationsUsed)) {
-+    foreach my $annotation (sort(keys(%AnnotationsUsed))) {
-         if(defined($AnnotationDefinition{$annotation})) {
-             my $def = $AnnotationDefinition{$annotation};
-             my $curletter = uc(substr($annotation,0,1));
--- 
-1.8.3.1
-
diff --git a/gtk-doc.spec b/gtk-doc.spec
index 65fe025..b96124b 100644
--- a/gtk-doc.spec
+++ b/gtk-doc.spec
@@ -1,15 +1,12 @@
 Summary: API documentation generation tool for GTK+ and GNOME
 Name: gtk-doc
-Version: 1.19
-Release: 4%{?dist}
+Version: 1.20
+Release: 1%{?dist}
 License: GPLv2+ and GFDL
 Group: Development/Tools
 #VCS: git:git://git.gnome.org/gtk-doc
 Source: http://download.gnome.org/sources/gtk-doc/1.18/gtk-doc-%{version}.tar.xz
 
-# upstream fix
-Patch0: 0001-gtkdoc-mkdb-sort-entries-in-the-glossary.patch
-
 BuildArch: noarch
 URL: http://www.gtk.org/gtk-doc
 
@@ -43,7 +40,7 @@ and GNOME.
 
 %prep
 %setup -q
-%patch0 -p1
+
 # Move this doc file to avoid name collisions
 mv doc/README doc/README.docs
 
@@ -68,6 +65,9 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html
 %{_datadir}/help/*/gtk-doc-manual/
 
 %changelog
+* Mon Feb 17 2014 Richard Hughes <rhughes@redhat.com> - 1.20-1
+- Update to 1.20
+
 * Tue Oct 29 2013 Matthias Clasen <mclasen@redhat.com> - 1.19-4
 - Fix sorting of the annotation glossary 
 
diff --git a/sources b/sources
index 2357647..57b4ea2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d1b5c074598415454a4be88228cc8f2  gtk-doc-1.19.tar.xz
+58532fed036f72fc3bfd4fe79473247b  gtk-doc-1.20.tar.xz