[xorg-x11-docs] - New upstream version (#640564)

[Matej Cepl]

commit a516cf955ac8324dc9a051758c192503a8bb902c
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Thu Jan 13 14:16:38 2011 +0100

    - New upstream version (#640564)

 .gitignore              |    1 +
 docs-1.3-registry.patch |   18 +++++++++---------
 sources                 |    2 +-
 xorg-x11-docs.spec      |    7 +++++--
 4 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6a2d086..e8705ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xorg-docs-1.3.tar.bz2
+/xorg-docs-1.6.tar.bz2
diff --git a/docs-1.3-registry.patch b/docs-1.3-registry.patch
index c0203e8..56a27ae 100644
--- a/docs-1.3-registry.patch
+++ b/docs-1.3-registry.patch
@@ -1,12 +1,12 @@
-diff -up xorg-docs-1.3/Makefile.am.jx xorg-docs-1.3/Makefile.am
---- xorg-docs-1.3/Makefile.am.jx	2006-09-19 11:00:53.000000000 -0400
-+++ xorg-docs-1.3/Makefile.am	2007-12-25 12:45:37.000000000 -0500
-@@ -23,7 +23,7 @@
- SUBDIRS = hardcopy man sgml
- x11docdir = @X11DOCDIR@
+diff -up xorg-docs-1.6/Makefile.am.registry xorg-docs-1.6/Makefile.am
+--- xorg-docs-1.6/Makefile.am.registry	2010-12-16 23:47:37.000000000 +0100
++++ xorg-docs-1.6/Makefile.am	2011-01-13 14:11:58.257705581 +0100
+@@ -22,7 +22,7 @@
  
--dist_x11doc_DATA = MAINTAINERS
-+dist_x11doc_DATA = MAINTAINERS registry
+ SUBDIRS = general man specs
  
+-dist_doc_DATA = MAINTAINERS
++dist_doc_DATA = MAINTAINERS registry
+ 
+ MAINTAINERCLEANFILES = ChangeLog INSTALL
  EXTRA_DIST = \
- 	MAINTAINERS \
diff --git a/sources b/sources
index d921ac5..ae09eba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-792d41a7a9f2e652b2ede4538c4bdf14  xorg-docs-1.3.tar.bz2
+86101433834b485ab243f235757d7079  xorg-docs-1.6.tar.bz2
diff --git a/xorg-x11-docs.spec b/xorg-x11-docs.spec
index 92eb7ac..bbaa770 100644
--- a/xorg-x11-docs.spec
+++ b/xorg-x11-docs.spec
@@ -2,8 +2,8 @@
 
 Summary: X.Org X11 documentation
 Name: xorg-x11-docs
-Version: 1.3
-Release: 7%{?dist}
+Version: 1.6
+Release: 1%{?dist}
 License: MIT
 Group: Documentation
 URL: http://www.x.org
@@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/security.7*
 
 %changelog
+* Thu Jan 13 2011 Matěj Cepl <mcepl at redhat.com> - 1.6-1
+- New upstream version (#640564)
+
 * Mon Nov 22 2010 Adam Jackson <ajax at redhat.com> 1.3-7
 - Fix ps-to-pdf conversion even harder.