Author: freetz Date: Mon Feb 6 21:52:23 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - switched to modular xorg, dropped xlibs cruft
---- Files affected: SPECS: gtk+2.spec (1.200 -> 1.201) ---- Diffs: ================================================================ Index: SPECS/gtk+2.spec diff -u SPECS/gtk+2.spec:1.200 SPECS/gtk+2.spec:1.201 --- SPECS/gtk+2.spec:1.200 Sat Jan 28 00:13:19 2006 +++ SPECS/gtk+2.spec Mon Feb 6 22:52:18 2006 @@ -3,7 +3,6 @@ # Conditional build: %bcond_without apidocs # disable gtk-doc %bcond_without static_libs # don't build static library -%bcond_with xlibs # use pkgconfig to find libX11 # Summary: The Gimp Toolkit Summary(cs): Sada nástrojů pro Gimp @@ -15,18 +14,16 @@ Summary(tr): Gimp ToolKit arayüz kitaplýđý Name: gtk+2 Version: 2.8.11 -Release: 1 +Release: 1.0 Epoch: 2 License: LGPL Group: X11/Libraries Source0: ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-%{version}.tar.bz2 # Source0-md5: 921ba85da341e52f0994f8fb569f1c61 Patch0: %{name}-insensitive-iain.patch -Patch1: %{name}-xlibs.patch # from CVS, should disapear in the next version -Patch2: %{name}-pl.po.patch +Patch1: %{name}-pl.po.patch URL: http://www.gtk.org/ -%{!?with_xlibs:BuildRequires: X11-devel >= 1:6.8.0} BuildRequires: atk-devel >= 1.8.0 BuildRequires: autoconf >= 2.54 BuildRequires: automake >= 1:1.7 @@ -37,8 +34,6 @@ BuildRequires: glib2-devel >= 1:2.8.5 %{?with_apidocs:BuildRequires: gtk-doc >= 1.0} BuildRequires: gtk-doc-automake >= 1.0 -%{?with_xlibs:BuildRequires: libXfixes-devel} -%{?with_xlibs:BuildRequires: libXi-devel} BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel @@ -49,8 +44,13 @@ BuildRequires: perl-base BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.197 -BuildRequires: xcursor-devel -Requires(post,postun): /sbin/ldconfig +BuildRequires: xorg-lib-libX11-devel +BuildRequires: xorg-lib-libXcursor-devel +BuildRequires: xorg-lib-libXext-devel +BuildRequires: xorg-lib-libXft-devel +BuildRequires: xorg-lib-libXinerama-devel +BuildRequires: xorg-lib-libXrandr-devel +BuildRequires: xorg-lib-libXrender-devel Requires: atk >= 1.8.0 Requires: cairo >= 0.9.2 Requires: glib2 >= 1:2.8.5 @@ -115,14 +115,17 @@ Summary(tr): GIMP araç takýmý ve çizim takýmý Group: X11/Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -%{!?with_xlibs:Requires: X11-devel >= 1:6.8.0} Requires: atk-devel >= 1.8.0 Requires: glib2-devel >= 1:2.8.0 Requires: gtk-doc-common -%{?with_xlibs:Requires: libXfixes-devel} -%{?with_xlibs:Requires: libXi-devel} Requires: pango-devel >= 1:1.10.0 -Requires: xcursor-devel +Requires: xorg-lib-libX11-devel +Requires: xorg-lib-libXcursor-devel +Requires: xorg-lib-libXext-devel +Requires: xorg-lib-libXft-devel +Requires: xorg-lib-libXinerama-devel +Requires: xorg-lib-libXrandr-devel +Requires: xorg-lib-libXrender-devel Obsoletes: gtk2-devel %description devel @@ -170,8 +173,7 @@ %prep %setup -q -n gtk+-%{version} %patch0 -p1 -%{?with_xlibs:%patch1 -p1} -%patch2 -p1 +%patch1 -p1 %build %{?with_apidocs:%{__gtkdocize}} @@ -310,6 +312,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.201 2006/02/06 21:52:18 freetz +- switched to modular xorg, dropped xlibs cruft + Revision 1.200 2006/01/27 23:13:19 freetz - 2.8.11 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.200&r2=1.201&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
