Author: qboosh Date: Sat Feb 18 16:02:12 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - dropped xlibs patch
---- Files affected: SPECS: pango.spec (1.136 -> 1.137) ---- Diffs: ================================================================ Index: SPECS/pango.spec diff -u SPECS/pango.spec:1.136 SPECS/pango.spec:1.137 --- SPECS/pango.spec:1.136 Wed Feb 8 16:54:36 2006 +++ SPECS/pango.spec Sat Feb 18 17:02:06 2006 @@ -1,7 +1,6 @@ # $Revision$, $Date$ # # 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 @@ -18,10 +17,9 @@ Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/%{name}-%{version}.tar.bz2 # Source0-md5: 6fc5097f9c10d90ed386e074cb22cf6f 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: XFree86-devel BuildRequires: autoconf >= 2.54 BuildRequires: automake >= 1:1.7 BuildRequires: cairo-devel >= 1.0.0 @@ -32,7 +30,6 @@ BuildRequires: glib2-devel >= 1:2.8.0 %{?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 @@ -61,12 +58,11 @@ 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: 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 Obsoletes: libpango24-devel @@ -124,8 +120,7 @@ %prep %setup -q %patch0 -p1 -%{?with_xlibs:%patch1 -p1} -%{?with_arch_confdir:%patch2 -p1} +%{?with_arch_confdir:%patch1 -p1} %build %{?with_apidocs:%{__gtkdocize}} @@ -222,6 +217,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.137 2006/02/18 16:02:06 qboosh +- dropped xlibs patch + Revision 1.136 2006/02/08 15:54:36 freetz - 1.10.3 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/pango.spec?r1=1.136&r2=1.137&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
