From 9d868c402df56d526006b305c861953974486fe3dd8b37a758e2db5431cf390d Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 3 Feb 2012 13:38:07 +0000
Subject: [PATCH 1/7] - still we need a LD_PRELOAD for the freshly introduced
 libxcb-util;   added this to /etc/profile.d/xorg-x11-libs.{csh,sh}; seems to 
  help on openSUSE 12.1, but apparently not on openSUSE 11.4   (bnc #742297)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=184
---
 xorg-x11-libs.changes |  8 ++++++++
 xorg-x11-libs.csh     |  7 +++++++
 xorg-x11-libs.sh      |  6 ++++++
 xorg-x11-libs.spec    | 13 +++++++++++++
 4 files changed, 34 insertions(+)
 create mode 100644 xorg-x11-libs.csh
 create mode 100644 xorg-x11-libs.sh

diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index 98ee5ec..483066b 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Feb  3 10:14:23 UTC 2012 - sndirsch@suse.com
+
+- still we need a LD_PRELOAD for the freshly introduced libxcb-util;
+  added this to /etc/profile.d/xorg-x11-libs.{csh,sh}; seems to
+  help on openSUSE 12.1, but apparently not on openSUSE 11.4 
+  (bnc #742297)
+
 -------------------------------------------------------------------
 Mon Jan 23 10:59:06 UTC 2012 - sndirsch@suse.com
 
diff --git a/xorg-x11-libs.csh b/xorg-x11-libs.csh
new file mode 100644
index 0000000..27a2e46
--- /dev/null
+++ b/xorg-x11-libs.csh
@@ -0,0 +1,7 @@
+# LD_PRELOAD required for the freshly introduced libxcb-util (bnc #742297)
+if ( ${?LD_PRELOAD} ) then
+        setenv LD_PRELOAD "${LD_PRELOAD} /usr/lib64/libxcb-util.so.0"
+else
+        setenv LD_PRELOAD /usr/lib64/libxcb-util.so.0
+endif
+
diff --git a/xorg-x11-libs.sh b/xorg-x11-libs.sh
new file mode 100644
index 0000000..f2d73bb
--- /dev/null
+++ b/xorg-x11-libs.sh
@@ -0,0 +1,6 @@
+# LD_PRELOAD required for the freshly introduced libxcb-util (bnc #742297)
+if [ -z "$LD_PRELOAD" ]; then
+        export LD_PRELOAD=/usr/lib64/libxcb-util.so.0
+else
+        export LD_PRELOAD="${LD_PRELOAD} /usr/lib64/libxcb-util.so.0"
+fi
diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index dcabe39..6bfe603 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -69,6 +69,8 @@ Source29:       libvnc-20070501.tar.bz2
 Source30:       libXcliplist-20070501.tar.bz2
 Source31:       xcb-util-0.3.8.tar.bz2
 Source90:       baselibs.conf
+Source91:       xorg-x11-libs.sh
+Source92:       xorg-x11-libs.csh
 Patch2:         libXft-2.1.7-lcd-filter-2.patch
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
@@ -154,6 +156,12 @@ for ext_version in atom:1 aux:0 event:1 icccm:1 image:0 keysyms:1 property:1 ren
   gcc -shared -Wl,-soname,libxcb-${ext}.so.${version} \
       -o $RPM_BUILD_ROOT%{_libdir}/libxcb-${ext}.so.${version} xcb-${ext}.o
 done
+%if %suse_version < 1220
+# still we need a LD_PRELOAD for the freshly introduced libxcb-util
+# (bnc #742297)
+mkdir -p $RPM_BUILD_ROOT/etc/profile.d/
+install -m 644 %{SOURCE91} %{SOURCE92} $RPM_BUILD_ROOT/etc/profile.d/
+%endif
 %if %suse_version > 1110
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 %endif
@@ -168,6 +176,11 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root)
+%if %suse_version < 1220
+%dir /etc/profile.d
+/etc/profile.d/xorg-x11-libs.csh
+/etc/profile.d/xorg-x11-libs.sh
+%endif
 /usr/include/X11/bitmaps/
 /usr/include/X11/pixmaps/
 /usr/%{_lib}/*.so.*

From 94b2d5642808df39d7806245a28cf6b458eb8a079f6aa1e9cdc0c420174cb521 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Mon, 6 Feb 2012 08:31:57 +0000
Subject: [PATCH 2/7] Accepting request 102763 from home:pontostroy

fix ld_preload libxcb-util.so.0 on %ix86

OBS-URL: https://build.opensuse.org/request/show/102763
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=185
---
 xorg-x11-libs.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index 6bfe603..2a7e120 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -100,6 +100,10 @@ This package contains all necessary include files and libraries needed
 to develop X11 applications that require these.
 
 %prep
+%ifarch %ix86
+sed -i  's/lib64/%{_lib}/g' %{SOURCE91}
+sed -i  's/lib64/%{_lib}/g' %{SOURCE92}
+%endif
 %setup -q -T -c %{name}
 for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
 pushd libXft-*/src

From e30b00b33cf8bda29796040d7aa98053cde5c8cf31cc108d203505e9c5875b6c Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 7 Feb 2012 17:49:53 +0000
Subject: [PATCH 3/7] - instead of using LD_PRELOAD link the fake libs against
 the   freshly introduced libxcb-util; hope this works out ...   Still this
 does not help on openSuSE 11.4 (bnc#742297)

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=186
---
 xorg-x11-libs.changes |  7 +++++++
 xorg-x11-libs.csh     |  7 -------
 xorg-x11-libs.sh      |  6 ------
 xorg-x11-libs.spec    | 18 +-----------------
 4 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 xorg-x11-libs.csh
 delete mode 100644 xorg-x11-libs.sh

diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index 483066b..f10c89f 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb  7 16:58:55 UTC 2012 - sndirsch@suse.com
+
+- instead of using LD_PRELOAD link the fake libs against the
+  freshly introduced libxcb-util; hope this works out ...
+  Still this does not help on openSuSE 11.4 (bnc#742297)
+
 -------------------------------------------------------------------
 Fri Feb  3 10:14:23 UTC 2012 - sndirsch@suse.com
 
diff --git a/xorg-x11-libs.csh b/xorg-x11-libs.csh
deleted file mode 100644
index 27a2e46..0000000
--- a/xorg-x11-libs.csh
+++ /dev/null
@@ -1,7 +0,0 @@
-# LD_PRELOAD required for the freshly introduced libxcb-util (bnc #742297)
-if ( ${?LD_PRELOAD} ) then
-        setenv LD_PRELOAD "${LD_PRELOAD} /usr/lib64/libxcb-util.so.0"
-else
-        setenv LD_PRELOAD /usr/lib64/libxcb-util.so.0
-endif
-
diff --git a/xorg-x11-libs.sh b/xorg-x11-libs.sh
deleted file mode 100644
index f2d73bb..0000000
--- a/xorg-x11-libs.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# LD_PRELOAD required for the freshly introduced libxcb-util (bnc #742297)
-if [ -z "$LD_PRELOAD" ]; then
-        export LD_PRELOAD=/usr/lib64/libxcb-util.so.0
-else
-        export LD_PRELOAD="${LD_PRELOAD} /usr/lib64/libxcb-util.so.0"
-fi
diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index 2a7e120..26d4cab 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -69,8 +69,6 @@ Source29:       libvnc-20070501.tar.bz2
 Source30:       libXcliplist-20070501.tar.bz2
 Source31:       xcb-util-0.3.8.tar.bz2
 Source90:       baselibs.conf
-Source91:       xorg-x11-libs.sh
-Source92:       xorg-x11-libs.csh
 Patch2:         libXft-2.1.7-lcd-filter-2.patch
 Patch5:         libxkbui.diff
 Patch10:        libXxf86misc-xcb.diff
@@ -100,10 +98,6 @@ This package contains all necessary include files and libraries needed
 to develop X11 applications that require these.
 
 %prep
-%ifarch %ix86
-sed -i  's/lib64/%{_lib}/g' %{SOURCE91}
-sed -i  's/lib64/%{_lib}/g' %{SOURCE92}
-%endif
 %setup -q -T -c %{name}
 for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
 pushd libXft-*/src
@@ -158,14 +152,9 @@ for ext_version in atom:1 aux:0 event:1 icccm:1 image:0 keysyms:1 property:1 ren
   > xcb-${ext}.c
   gcc -Wall -ansi -pedantic -c xcb-${ext}.c -fPIC
   gcc -shared -Wl,-soname,libxcb-${ext}.so.${version} \
+      -Wl,-L$RPM_BUILD_ROOT%{_libdir},--no-as-needed,-lxcb-util \
       -o $RPM_BUILD_ROOT%{_libdir}/libxcb-${ext}.so.${version} xcb-${ext}.o
 done
-%if %suse_version < 1220
-# still we need a LD_PRELOAD for the freshly introduced libxcb-util
-# (bnc #742297)
-mkdir -p $RPM_BUILD_ROOT/etc/profile.d/
-install -m 644 %{SOURCE91} %{SOURCE92} $RPM_BUILD_ROOT/etc/profile.d/
-%endif
 %if %suse_version > 1110
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 %endif
@@ -180,11 +169,6 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root)
-%if %suse_version < 1220
-%dir /etc/profile.d
-/etc/profile.d/xorg-x11-libs.csh
-/etc/profile.d/xorg-x11-libs.sh
-%endif
 /usr/include/X11/bitmaps/
 /usr/include/X11/pixmaps/
 /usr/%{_lib}/*.so.*

From 9bf0e5d21ee2355ed276e2c958abf1b75970593ef1b19bc02cae6e5394f1f814 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 9 Feb 2012 15:20:37 +0000
Subject: [PATCH 4/7] - no longer package anything, since libs are now packaged
   seperately ==> dummy package

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=187
---
 xorg-x11-libs.changes |  6 ++++++
 xorg-x11-libs.spec    | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index f10c89f..b46f4b8 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb  9 14:28:07 UTC 2012 - sndirsch@suse.com
+
+- no longer package anything, since libs are now packaged
+  seperately ==> dummy package
+
 -------------------------------------------------------------------
 Tue Feb  7 16:58:55 UTC 2012 - sndirsch@suse.com
 
diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index 26d4cab..cca1f99 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -17,9 +17,11 @@
 
 # norootforbuild
 
+%define dummy 1
 
 Name:           xorg-x11-libs
 BuildRequires:  fdupes fontconfig-devel freetype2-devel gperf libXi6-devel libexpat-devel libtool libxslt pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-util-devel xorg-x11-xtrans-devel
+%if !%{dummy}
 %ifarch ppc64 s390x x86_64
 Provides:       libXaw.so.8()(64bit) libXaw.so.7()(64bit) libXaw.so.6()(64bit)
 Provides:       libXaw8.so.8()(64bit) libXaw7.so.7()(64bit) libXaw6.so.6()(64bit)
@@ -27,6 +29,7 @@ Provides:       libXaw8.so.8()(64bit) libXaw7.so.7()(64bit) libXaw6.so.6()(64bit
 Provides:       libXaw.so.8 libXaw.so.7 libXaw.so.6
 Provides:       libXaw8.so.8 libXaw7.so.7 libXaw6.so.6
 %endif
+%endif
 # bug437293
 %ifarch ppc64
 Obsoletes:      xorg-x11-libs-64bit
@@ -99,6 +102,7 @@ to develop X11 applications that require these.
 
 %prep
 %setup -q -T -c %{name}
+%if !%{dummy}
 for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
 pushd libXft-*/src
 %patch2 -p1
@@ -112,8 +116,12 @@ popd
 pushd libXfont-*
 %patch11 -p1
 popd
+%else
+touch dummy
+%endif
 
 %build
+%if !%{dummy}
 for dir in $(ls); do
   pushd $dir
     case $dir in
@@ -129,8 +137,10 @@ for dir in $(ls); do
     %{__make} %{?_smp_mflags}
   popd
 done
+%endif
 
 %install
+%if !%{dummy}
 for dir in $(ls); do
   pushd $dir
     make install DESTDIR=$RPM_BUILD_ROOT
@@ -159,6 +169,7 @@ done
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 %endif
 %fdupes -s $RPM_BUILD_ROOT/%_mandir
+%endif
 
 %clean
 rm -rf "$RPM_BUILD_ROOT"
@@ -169,12 +180,19 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root)
+%if %{dummy}
+%doc dummy
+%else
 /usr/include/X11/bitmaps/
 /usr/include/X11/pixmaps/
 /usr/%{_lib}/*.so.*
+%endif
 
 %files -n xorg-x11-devel
 %defattr(-,root,root)
+%if %{dummy}
+%doc dummy
+%else
 %doc /usr/share/doc/*
 /usr/include/X11/*.h
 /usr/include/X11/Xaw/
@@ -194,5 +212,6 @@ rm -rf "$RPM_BUILD_ROOT"
 %doc %{_datadir}/doc/libXvMC/
 %doc %{_datadir}/doc/libXaw/
 %doc %{_datadir}/doc/libFS/
+%endif
 
 %changelog

From 8f94910bf92b0610622ea85cb53caae64d692c6ae96706f10665765df584b687 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 9 Feb 2012 15:26:31 +0000
Subject: [PATCH 5/7] - please rebuild !!!

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=188
---
 xorg-x11-libs.changes | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index b46f4b8..78adc3e 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  9 15:26:18 UTC 2012 - sndirsch@suse.com
+
+- please rebuild !!! 
+
 -------------------------------------------------------------------
 Thu Feb  9 14:28:07 UTC 2012 - sndirsch@suse.com
 

From 90d6d9feb2eac1b8aa6742fe20ffa016d4e060f59270da26fd7095bc361dec04 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Fri, 10 Feb 2012 16:19:02 +0000
Subject: [PATCH 6/7] - back to real libs package, but no longer preferred in
 project

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=189
---
 xorg-x11-libs.changes | 5 +++++
 xorg-x11-libs.spec    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index 78adc3e..52bc2e5 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb 10 16:18:29 UTC 2012 - sndirsch@suse.com
+
+- back to real libs package, but no longer preferred in project 
+
 -------------------------------------------------------------------
 Thu Feb  9 15:26:18 UTC 2012 - sndirsch@suse.com
 
diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index cca1f99..248b3c4 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -17,7 +17,7 @@
 
 # norootforbuild
 
-%define dummy 1
+%define dummy 0
 
 Name:           xorg-x11-libs
 BuildRequires:  fdupes fontconfig-devel freetype2-devel gperf libXi6-devel libexpat-devel libtool libxslt pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-util-devel xorg-x11-xtrans-devel

From 15899f93a4ad57f51f97a9028f6b00f2f63e39889cde24d2d2232505ae45ca38 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 14 Feb 2012 11:26:15 +0000
Subject: [PATCH 7/7] - turned -devel package into a meta package, which now
 requires   all the previously required packages by adding the appropriate  
 pkgconfig(...) Requires

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-libs?expand=0&rev=190
---
 xorg-x11-libs.changes |   7 +++
 xorg-x11-libs.spec    | 126 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 118 insertions(+), 15 deletions(-)

diff --git a/xorg-x11-libs.changes b/xorg-x11-libs.changes
index 52bc2e5..f7d6c5b 100644
--- a/xorg-x11-libs.changes
+++ b/xorg-x11-libs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 14 11:18:00 UTC 2012 - sndirsch@suse.com
+
+- turned -devel package into a meta package, which now requires
+  all the previously required packages by adding the appropriate 
+  pkgconfig(...) Requires
+
 -------------------------------------------------------------------
 Fri Feb 10 16:18:29 UTC 2012 - sndirsch@suse.com
 
diff --git a/xorg-x11-libs.spec b/xorg-x11-libs.spec
index 248b3c4..3e1c1e7 100644
--- a/xorg-x11-libs.spec
+++ b/xorg-x11-libs.spec
@@ -17,11 +17,11 @@
 
 # norootforbuild
 
-%define dummy 0
+%define meta 1
 
 Name:           xorg-x11-libs
 BuildRequires:  fdupes fontconfig-devel freetype2-devel gperf libXi6-devel libexpat-devel libtool libxslt pkgconfig xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-util-devel xorg-x11-xtrans-devel
-%if !%{dummy}
+%if !%{meta}
 %ifarch ppc64 s390x x86_64
 Provides:       libXaw.so.8()(64bit) libXaw.so.7()(64bit) libXaw.so.6()(64bit)
 Provides:       libXaw8.so.8()(64bit) libXaw7.so.7()(64bit) libXaw6.so.6()(64bit)
@@ -84,17 +84,113 @@ This package contains the remaining X.Org libraries.
 License:        GPL-2.0+ ; MIT
 Summary:        Include Files and Libraries mandatory for X11 Development
 Group:          Development/Libraries/X11
+%if !%{meta}
 Provides:       xorg-x11-compat70-devel xorg-x11-man XFree86-devel
 Obsoletes:      xorg-x11-compat70-devel xorg-x11-man
-Requires:       xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXrender-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXt-devel xorg-x11-libXmu-devel xorg-x11-libXfixes-devel xorg-x11-libxkbfile-devel freetype2-devel fontconfig-devel %{name} = %{version} xorg-x11-util-devel xorg-x11-libfontenc-devel xorg-x11-libXv-devel xorg-x11-libXprintUtil-devel xorg-x11-fonts-devel pkgconfig libXi6-devel
-Requires:       xorg-x11-libxcb-devel
-Requires:       libpciaccess0-devel libpixman-1-0-devel
-AutoReqProv:    on
 # bug437293
 %ifarch ppc64
 Obsoletes:      xorg-x11-devel-64bit
 %endif
-#
+Requires:       xorg-x11-proto-devel xorg-x11-xtrans-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libX11-devel xorg-x11-libXext-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXrender-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libXt-devel xorg-x11-libXmu-devel xorg-x11-libXfixes-devel xorg-x11-libxkbfile-devel freetype2-devel fontconfig-devel %{name} = %{version} xorg-x11-util-devel xorg-x11-libfontenc-devel xorg-x11-libXv-devel xorg-x11-libXprintUtil-devel xorg-x11-fonts-devel pkgconfig libXi6-devel
+Requires:       xorg-x11-libxcb-devel
+Requires:       libpciaccess0-devel libpixman-1-0-devel
+AutoReqProv:    on
+%else
+Requires:       freetype2-devel 
+Requires:       fontconfig-devel 
+Requires:       pkgconfig 
+Requires:       pkgconfig(applewmproto)
+Requires:       pkgconfig(bigreqsprot)
+Requires:       pkgconfig(bigreqsproto)
+Requires:       pkgconfig(compositeproto)
+Requires:       pkgconfig(damageproto)
+Requires:       pkgconfig(dmxproto)
+Requires:       pkgconfig(dri2proto)
+Requires:       pkgconfig(evieext)
+Requires:       pkgconfig(evieproto)
+Requires:       pkgconfig(fixesproto)
+Requires:       pkgconfig(fontcacheproto)
+Requires:       pkgconfig(fontenc)
+Requires:       pkgconfig(fontsproto)
+Requires:       pkgconfig(fontutil)
+Requires:       pkgconfig(glproto)
+Requires:       pkgconfig(ice)
+Requires:       pkgconfig(inputproto)
+Requires:       pkgconfig(kbproto)
+Requires:       pkgconfig(libpthread-stubs)
+Requires:       pkgconfig(pciaccess)
+Requires:       pkgconfig(pixman-1)
+Requires:       pkgconfig(printproto)
+Requires:       pkgconfig(pthread-stubs)
+Requires:       pkgconfig(randrproto)
+Requires:       pkgconfig(recordproto)
+Requires:       pkgconfig(renderproto)
+Requires:       pkgconfig(resourceproto)
+Requires:       pkgconfig(scrnsaveproto)
+Requires:       pkgconfig(scrnsaverproto)
+Requires:       pkgconfig(sm)
+Requires:       pkgconfig(trapproto)
+Requires:       pkgconfig(util-macros)
+Requires:       pkgconfig(videoproto)
+Requires:       pkgconfig(vncproto)
+Requires:       pkgconfig(windowswmproto)
+Requires:       pkgconfig(x11)
+Requires:       pkgconfig(x11-xcb)
+Requires:       pkgconfig(x86bigfontproto)
+Requires:       pkgconfig(xau)
+Requires:       pkgconfig(xcb)
+Requires:       pkgconfig(xcb-composite)
+Requires:       pkgconfig(xcb-damage)
+Requires:       pkgconfig(xcb-dpms)
+Requires:       pkgconfig(xcb-dri2)
+Requires:       pkgconfig(xcb-glx)
+Requires:       pkgconfig(xcb-proto)
+Requires:       pkgconfig(xcb-randr)
+Requires:       pkgconfig(xcb-record)
+Requires:       pkgconfig(xcb-render)
+Requires:       pkgconfig(xcb-res)
+Requires:       pkgconfig(xcb-screensaver)
+Requires:       pkgconfig(xcb-shape)
+Requires:       pkgconfig(xcb-shm)
+Requires:       pkgconfig(xcb-sync)
+Requires:       pkgconfig(xcb-xevie)
+Requires:       pkgconfig(xcb-xf86dri)
+Requires:       pkgconfig(xcb-xfixes)
+Requires:       pkgconfig(xcb-xinerama)
+Requires:       pkgconfig(xcb-xprint)
+Requires:       pkgconfig(xcb-xtest)
+Requires:       pkgconfig(xcb-xv)
+Requires:       pkgconfig(xcb-xvmc)
+Requires:       pkgconfig(xcliplistproto)
+Requires:       pkgconfig(xcmiscproto)
+Requires:       pkgconfig(xdmcp)
+Requires:       pkgconfig(xext)
+Requires:       pkgconfig(xextproto)
+Requires:       pkgconfig(xf86bigfontproto)
+Requires:       pkgconfig(xf86dgaproto)
+Requires:       pkgconfig(xf86driproto)
+Requires:       pkgconfig(xf86miscproto)
+Requires:       pkgconfig(xf86rushproto)
+Requires:       pkgconfig(xf86vidmodeproto)
+Requires:       pkgconfig(xfixes)
+Requires:       pkgconfig(xi)
+Requires:       pkgconfig(xineramaproto)
+Requires:       pkgconfig(xkbfile)
+Requires:       pkgconfig(xmu)
+Requires:       pkgconfig(xmuu)
+Requires:       pkgconfig(xorg-macros)
+Requires:       pkgconfig(xorg-sgml-doctools)
+Requires:       pkgconfig(xp)
+Requires:       pkgconfig(xpm)
+Requires:       pkgconfig(xprintutil)
+Requires:       pkgconfig(xproto)
+Requires:       pkgconfig(xproxymanagementprotocol)
+Requires:       pkgconfig(xproxymngproto)
+Requires:       pkgconfig(xrender)
+Requires:       pkgconfig(xt)
+Requires:       pkgconfig(xtrans)
+Requires:       pkgconfig(xv)
+%endif
 
 %description -n xorg-x11-devel
 This package contains all necessary include files and libraries needed
@@ -102,7 +198,7 @@ to develop X11 applications that require these.
 
 %prep
 %setup -q -T -c %{name}
-%if !%{dummy}
+%if !%{meta}
 for i in $RPM_SOURCE_DIR/*.tar.bz2; do tar xjf $i; done
 pushd libXft-*/src
 %patch2 -p1
@@ -117,11 +213,11 @@ pushd libXfont-*
 %patch11 -p1
 popd
 %else
-touch dummy
+touch meta
 %endif
 
 %build
-%if !%{dummy}
+%if !%{meta}
 for dir in $(ls); do
   pushd $dir
     case $dir in
@@ -140,7 +236,7 @@ done
 %endif
 
 %install
-%if !%{dummy}
+%if !%{meta}
 for dir in $(ls); do
   pushd $dir
     make install DESTDIR=$RPM_BUILD_ROOT
@@ -180,8 +276,8 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files
 %defattr(-,root,root)
-%if %{dummy}
-%doc dummy
+%if %{meta}
+%doc meta
 %else
 /usr/include/X11/bitmaps/
 /usr/include/X11/pixmaps/
@@ -190,8 +286,8 @@ rm -rf "$RPM_BUILD_ROOT"
 
 %files -n xorg-x11-devel
 %defattr(-,root,root)
-%if %{dummy}
-%doc dummy
+%if %{meta}
+%doc meta
 %else
 %doc /usr/share/doc/*
 /usr/include/X11/*.h