From aadbf07abfe9e4e10471506fda4e2fbd02389eaba6698afa294f25b6b09e16ec Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 2 Jun 2011 09:55:08 +0000
Subject: [PATCH] Accepting request 72368 from home:eeich:branches:X11:XOrg

- removed libXTrap-pcfix.diff:
  * This patch is rather irrelevant to us. We are not even
    going to submit it to upstream.

OBS-URL: https://build.opensuse.org/request/show/72368
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=161
---
 libXTrap-pcfix.diff   | 12 ------------
 xorg-x11-libs.changes |  7 +++++++
 xorg-x11-libs.spec    |  6 +-----
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 libXTrap-pcfix.diff

diff --git a/libXTrap-pcfix.diff b/libXTrap-pcfix.diff
deleted file mode 100644
index 6a28b7d..0000000
--- a/libXTrap-pcfix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: libXTrap-X11R7.0-1.0.0/xtrap.pc.in
-===================================================================
---- libXTrap-X11R7.0-1.0.0.orig/xtrap.pc.in
-+++ libXTrap-X11R7.0-1.0.0/xtrap.pc.in
-@@ -6,7 +6,6 @@ includedir=@includedir@
- Name: XTrap
- Description: X Trap Library
- Version: @PACKAGE_VERSION@
--Requires: trapproto
- Requires.private: x11 xext xt
- Cflags: -I${includedir}
- Libs: -L${libdir} -lXTrap
diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index 69a078f..ce9fa39 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue May 31 09:12:57 UTC 2011 - eich@suse.de
+
+- removed libXTrap-pcfix.diff:
+  * This patch is rather irrelevant to us. We are not even
+    going to submit it to upstream.
+
 -------------------------------------------------------------------
 Tue Dec 21 02:49:24 UTC 2010 - sndirsch@novell.com
 
diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index def9abd..4116267 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -34,7 +34,7 @@ Obsoletes:      xorg-x11-libs-64bit
 #
 Url:            http://xorg.freedesktop.org/
 Version:        7.6
-Release:        14
+Release:        1
 License:        GPLv2+ ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/Libraries
@@ -73,7 +73,6 @@ Source90:       baselibs.conf
 Patch2:         libXft-2.1.7-lcd-filter-2.patch
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
-Patch21:        libXTrap-pcfix.diff
 
 %description
 This package contains the remaining X.Org libraries.
@@ -227,9 +226,6 @@ popd
 pushd libXxf86misc-*
 %patch10 -p0
 popd
-pushd libXTrap-*
-%patch21 -p1
-popd
 
 %build
 for dir in $(ls); do