From 32b8d98f4219bfa9cd71bcac1f41cc8f038e64e9 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Mon, 31 Oct 2005 19:43:59 +0000
Subject: [PATCH] Switch requires to modular X

---
 pango.spec | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pango.spec b/pango.spec
index 15d776e..7babf42 100644
--- a/pango.spec
+++ b/pango.spec
@@ -8,7 +8,7 @@
 Summary: System for layout and rendering of internationalized text.
 Name: pango
 Version: 1.10.1
-Release: 2
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/pango/1.8/pango-%{version}.tar.bz2
@@ -18,7 +18,9 @@ BuildRoot: %{_tmppath}/pango-%{PACKAGE_VERSION}-root
 # We need to prereq this so we can run pango-querymodules
 Prereq: glib2 >= %{glib2_version}
 Prereq: freetype >= %{freetype_version}
-#Prereq: xorg-x11-libs
+Prereq: libXrender
+Prereq: libX11
+Prereq: libXext
 Requires: freetype >= %{freetype_version}
 Requires: cairo >= %{cairo_version}
 BuildRequires: libtool >= 1.4.2-10
@@ -26,7 +28,9 @@ BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pkgconfig >= %{pkgconfig_version}
 BuildRequires: freetype-devel >= %{freetype_version}
 BuildRequires: fontconfig-devel >= %{fontconfig_version}
-#BuildRequires: xorg-x11-devel >= 4.2.99
+BuildRequires: libXrender-devel
+BuildRequires: libX11-devel
+BuildRequires: libXext-devel
 BuildRequires: cairo >= %{cairo_version}
 Obsoletes: pango-gtkbeta, fribidi-gtkbeta
 
@@ -42,7 +46,9 @@ Pango is a system for layout and rendering of internationalized text.
 Summary: System for layout and rendering of internationalized text.
 Group: Development/Libraries
 Requires: pango = %{PACKAGE_VERSION}
-#Requires: XFree86-devel >= 4.2.99
+Requires: libXrender-devel
+Requires: libX11-devel
+Requires: libXext-devel
 Requires: glib2-devel >= %{glib2_version}
 Requires: freetype-devel >= %{freetype_version}
 Requires: fontconfig-devel >= %{fontconfig_version}
@@ -97,6 +103,7 @@ fi
 
 # Remove files that should not be packaged
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/pango/1.4.0/modules/*.la
 
 PANGOXFT_SO=$RPM_BUILD_ROOT%{_libdir}/libpangoxft-1.0.so
 if ! test -e $PANGOXFT_SO; then
@@ -180,6 +187,10 @@ esac
 
 
 %changelog
+* Mon Oct 31 2005 Matthias Clasen <mclasen@redhat.com> - 1.10.1-3
+- Switch buildrequires to modular X.
+- Don't install .la files for modules.
+
 * Thu Oct 27 2005 Matthias Clasen <mclasen@redhat.com> - 1.10.1-2
 - Bump the requirement for glib (#165928)