From 461c9c8bd5f912492045b8fbe99923755db72f22 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@fedoraproject.org>
Date: Mon, 6 Jul 2009 21:13:40 +0000
Subject: [PATCH] - libX11 1.2.1 - Move Compose data and etc to -common subpkg

---
 .cvsignore  |  2 +-
 libX11.spec | 29 ++++++++++++++++++++++-------
 sources     |  2 +-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c6c3266..824ad1e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libX11-1.2.tar.bz2
+libX11-1.2.1.tar.bz2
diff --git a/libX11.spec b/libX11.spec
index 210038f..79ced11 100644
--- a/libX11.spec
+++ b/libX11.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libX11 runtime library
 Name: libX11
-Version: 1.2
-Release: 3%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -22,17 +22,25 @@ BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
 
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
+Requires: %{name}-common = %{version}-%{release}
 
 %description
 X.Org X11 libX11 runtime library
 
+%package common
+Summary: X.Org X11 libX11 common data
+Group: System Environment/Libraries
+BuildArch: noarch
+
+%description common
+X.Org X11 libX11 common data
+
 %package devel
 Summary: X.Org X11 libX11 development package
 Group: Development/Libraries
 Requires(pre): xorg-x11-filesystem >= 0.99.2-3
 Requires: %{name} = %{version}-%{release}
 
-# xproto >= 7.0.6 required
 Requires: xorg-x11-proto-devel >= 7.1-2
 Requires: libXau-devel, libXdmcp-devel, libxcb-devel
 Requires: pkgconfig
@@ -72,15 +80,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%{_libdir}/libX11.so.6
+%{_libdir}/libX11.so.6.2.0
+%{_libdir}/libX11-xcb.so.1
+%{_libdir}/libX11-xcb.so.1.0.0
+
+%files common
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING README NEWS
 %dir %{_datadir}/X11
 %{_datadir}/X11/locale/
 %{_datadir}/X11/XErrorDB
 %{_datadir}/X11/XKeysymDB
-%{_libdir}/libX11.so.6
-%{_libdir}/libX11.so.6.2.0
-%{_libdir}/libX11-xcb.so.1
-%{_libdir}/libX11-xcb.so.1.0.0
 
 %files devel
 %defattr(-,root,root,-)
@@ -104,6 +115,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Jul 06 2009 Adam Jackson <ajax@redhat.com> 1.2.1-1
+- libX11 1.2.1
+- Move Compose data and etc to -common subpkg
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index 302f137..13c1ce7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6265b59ea2b594fd68e33f9125b4d20  libX11-1.2.tar.bz2
+2f2beb98e71f397e1209beaca4e97cb1  libX11-1.2.1.tar.bz2