SPECS (DEVEL): pango.spec - 1.11.4, switched to modular xorg, drop...

[freetz]

Author: freetz                       Date: Mon Feb  6 17:11:50 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 1.11.4, switched to modular xorg, dropped xlibs cruft

---- Files affected:
SPECS:
   pango.spec (1.135.2.3 -> 1.135.2.4) 

---- Diffs:

================================================================
Index: SPECS/pango.spec
diff -u SPECS/pango.spec:1.135.2.3 SPECS/pango.spec:1.135.2.4
--- SPECS/pango.spec:1.135.2.3	Tue Jan 31 16:25:22 2006
+++ SPECS/pango.spec	Mon Feb  6 18:11:45 2006
@@ -1,7 +1,9 @@
 # $Revision$, $Date$
 #
+# TODO:
+# - /usr/bin/pango-view
+#
 # Conditional build:
-%bcond_with	xlibs		# use pkgconfig to find libX11 CFLAGS
 %bcond_without	apidocs		# disable gtk-doc
 %bcond_without	static_libs	# don't build static library
 %bcond_with	arch_confdir	# build with arch-dependant config dir
@@ -10,18 +12,16 @@
 Summary(pl):	System renderowania międzynarodowego tekstu
 Summary(pt_BR):	Sistema para layout e renderizaçăo de texto internacionalizado
 Name:		pango
-Version:	1.11.3
+Version:	1.11.4
 Release:	1
 Epoch:		1
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.gtk.org/pub/gtk/v2.9/%{name}-%{version}.tar.bz2
-# Source0-md5:	2a73f535c07b187503e4610bb1b5a972
+# Source0-md5:	eb605a207bcc44ad7554c56c073aa17b
 Patch0:		%{name}-xfonts.patch
-Patch1:		%{name}-xlibs.patch
-Patch2:		%{name}-arch_confdir.patch
+Patch1:		%{name}-arch_confdir.patch
 URL:		http://www.pango.org/
-%{!?with_xlibs:BuildRequires:	XFree86-devel}
 BuildRequires:	autoconf >= 2.54
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	cairo-devel >= 1.0.0
@@ -32,12 +32,13 @@
 BuildRequires:	glib2-devel >= 1:2.9.1
 %{?with_apidocs:BuildRequires:	gtk-doc >= 1.0}
 BuildRequires:	gtk-doc-automake >= 1.0
-%{?with_xlibs:BuildRequires:	libX11-devel}
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
-BuildRequires:	xft-devel >= 2.1.0
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXft-devel
+BuildRequires:	xorg-lib-libXrender-devel
 Requires:	cairo >= 1.0.0
 Requires:	freetype >= 2.1.7
 Requires:	glib2 >= 1:2.9.1
@@ -60,13 +61,13 @@
 Summary(pt_BR):	Sistema para layout e renderizaçăo de texto internacionalizado
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-%{!?with_xlibs:Requires:	XFree86-devel}
 Requires:	cairo-devel >= 1.0.0
 Requires:	freetype-devel >= 2.1.7
 Requires:	glib2-devel >= 1:2.8.0
 Requires:	gtk-doc-common
-%{?with_xlibs:Requires:	libX11-devel}
-Requires:	xft-devel >= 2.1.0
+Requires:	xorg-lib-libX11-devel
+Requires:	xorg-lib-libXft-devel
+Requires:	xorg-lib-libXrender-devel
 Obsoletes:	libpango24-devel
 
 %description devel
@@ -164,7 +165,7 @@
 > $RPM_BUILD_ROOT%{_sysconfdir}/pango%{?with_arch_confdir:-%{_host_cpu}}/pango.modules
 
 # useless (modules loaded through libgmodule)
-rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/1.4.0/modules/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/1.5.0/modules/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -193,9 +194,9 @@
 %attr(755,root,root) %{_bindir}/pango-querymodules
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 %dir %{_libdir}/pango
-%dir %{_libdir}/pango/1.4.0
-%dir %{_libdir}/pango/1.4.0/modules
-%attr(755,root,root) %{_libdir}/pango/1.4.0/modules/*basic*.so
+%dir %{_libdir}/pango/1.5.0
+%dir %{_libdir}/pango/1.5.0/modules
+%attr(755,root,root) %{_libdir}/pango/1.5.0/modules/*basic*.so
 %if %{with arch_confdir}
 %dir %{_sysconfdir}/pango-%{_host_cpu}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pango-%{_host_cpu}/pangox.aliases
@@ -223,8 +224,8 @@
 
 %files modules
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/pango/1.4.0/modules/*.so
-%exclude %{_libdir}/pango/1.4.0/modules/*basic*.so
+%attr(755,root,root) %{_libdir}/pango/1.5.0/modules/*.so
+%exclude %{_libdir}/pango/1.5.0/modules/*basic*.so
 
 %if %{with apidocs}
 %files apidocs
@@ -238,6 +239,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135.2.4  2006/02/06 17:11:45  freetz
+- 1.11.4, switched to modular xorg, dropped xlibs cruft
+
 Revision 1.135.2.3  2006/01/31 15:25:22  freetz
 - 1.11.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pango.spec?r1=1.135.2.3&r2=1.135.2.4&f=u