rpms/pango/devel pango.spec,1.41,1.42

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/pango/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29049

Modified Files:
	pango.spec 
Log Message:
Switch requires to modular X



Index: pango.spec
===================================================================
RCS file: /cvs/dist/rpms/pango/devel/pango.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- pango.spec	31 Oct 2005 16:28:38 -0000	1.41
+++ pango.spec	31 Oct 2005 19:43:59 -0000	1.42
@@ -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 @@
 # 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: 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 @@
 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 @@
 
 # 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 @@
 
 
 %changelog
+* Mon Oct 31 2005 Matthias Clasen <mclasen at 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 at redhat.com> - 1.10.1-2
 - Bump the requirement for glib (#165928)