From 17d53cce556df50c06efffc4f6aa909789d22e63aee3294efebb74f523999c31 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 12 Nov 2010 12:06:53 +0000
Subject: [PATCH] - xorg-docs-1.5 - adjusted xorg-docs.diff

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=302
---
 xorg-docs-1.4.tar.bz2   |  3 ---
 xorg-docs-1.5.tar.bz2   |  3 +++
 xorg-docs.diff          | 11 +++++------
 xorg-x11-server.changes |  6 ++++++
 xorg-x11-server.spec    |  2 +-
 5 files changed, 15 insertions(+), 10 deletions(-)
 delete mode 100644 xorg-docs-1.4.tar.bz2
 create mode 100644 xorg-docs-1.5.tar.bz2

diff --git a/xorg-docs-1.4.tar.bz2 b/xorg-docs-1.4.tar.bz2
deleted file mode 100644
index 00fb7a3..0000000
--- a/xorg-docs-1.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fffc67e50ce396e6ddd95e842fa8351954b8f09cb729a9a062e0496a8bda4925
-size 8300321
diff --git a/xorg-docs-1.5.tar.bz2 b/xorg-docs-1.5.tar.bz2
new file mode 100644
index 0000000..b8929e7
--- /dev/null
+++ b/xorg-docs-1.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:62cc63582e97ad76a02acdb409123ff0e2cf33df25c9977e3b8a7606be75eafc
+size 2149748
diff --git a/xorg-docs.diff b/xorg-docs.diff
index 0c895e8..4541471 100644
--- a/xorg-docs.diff
+++ b/xorg-docs.diff
@@ -6,7 +6,7 @@ Index: Makefile.am
  #
  #  Process this file with autoconf to create configure.
  
--SUBDIRS = hardcopy man sgml
+-SUBDIRS = man sgml
 +SUBDIRS = man
  x11docdir = @X11DOCDIR@
  
@@ -15,18 +15,17 @@ Index: Makefile.am
  EXTRA_DIST = \
  	MAINTAINERS \
  	misc/xlogo.epsi \
---- man/general/Makefile.am
-+++ man/general/Makefile.am
-@@ -23,13 +23,8 @@
+--- man/general/Makefile.am.orig	2009-10-25 22:46:33.000000000 +0100
++++ man/general/Makefile.am	2010-11-12 13:00:16.000000000 +0100
+@@ -23,12 +23,8 @@
  miscmandir = $(MISC_MAN_DIR)
  
  miscman_PRE = \
 -	Consortium.man \
- 	security.man \
+ 	Xsecurity.man \
 -	Standards.man \
 -	X.man \
 -	XOrgFoundation.man \
--	Xprint.man \
 -	XProjectTeam.man
 +	X.man
  
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 6b61748..8e00c1a 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov 12 12:06:22 UTC 2010 - sndirsch@novell.com
+
+- xorg-docs-1.5
+- adjusted xorg-docs.diff 
+
 -------------------------------------------------------------------
 Tue Nov  9 23:49:23 UTC 2010 - sndirsch@novell.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 46f8828..243cc6f 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -53,7 +53,7 @@ Source1:        sysconfig.displaymanager.template
 Source3:        README.updates
 Source4:        xorgcfg.tar.bz2
 Source5:        modprobe.nvidia
-Source7:        xorg-docs-1.4.tar.bz2
+Source7:        xorg-docs-1.5.tar.bz2
 Source8:        xorg-backtrace
 Patch1:         fpic.diff
 Patch2:         p_default-module-path.diff