Author: freetz                       Date: Wed May 31 19:13:23 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 2.8.18, GNOME 2.14.2 deps

---- Files affected:
SPECS:
   gtk+2.spec (1.200.2.6 -> 1.200.2.7) 

---- Diffs:

================================================================
Index: SPECS/gtk+2.spec
diff -u SPECS/gtk+2.spec:1.200.2.6 SPECS/gtk+2.spec:1.200.2.7
--- SPECS/gtk+2.spec:1.200.2.6  Sun May 14 22:35:04 2006
+++ SPECS/gtk+2.spec    Wed May 31 21:13: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
 %bcond_with    arch_confdir    # build with architecture-dependant config dir
 #
 Summary:       The Gimp Toolkit
@@ -15,31 +14,28 @@
 Summary(pl):   Gimp Toolkit
 Summary(tr):   Gimp ToolKit arayüz kitaplýđý
 Name:          gtk+2
-Version:       2.8.17
+Version:       2.8.18
 Release:       1
 Epoch:         2
 License:       LGPL
 Group:         X11/Libraries
 Source0:       ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-%{version}.tar.bz2
-# Source0-md5: 6d2deb63a5444808d2aeb7dcfffaa2f4
+# Source0-md5: 0d27a026428732337676d47d22e5e23c
 Patch0:                %{name}-insensitive-iain.patch
-Patch1:                %{name}-xlibs.patch
-Patch2:                %{name}-tree_selection_emit_changed.patch
-Patch3:                %{name}-arch_confdir.patch
+Patch1:                %{name}-tree_selection_emit_changed.patch
+Patch2:                %{name}-arch_confdir.patch
 URL:           http://www.gtk.org/
-%{!?with_xlibs:BuildRequires:  X11-devel >= 1:6.8.0}
+BuildRequires: X11-devel >= 1:6.8.0
 BuildRequires: atk-devel >= 1.8.0
 BuildRequires: autoconf >= 2.54
 BuildRequires: automake >= 1:1.7
-BuildRequires: cairo-devel >= 1.0.0
+BuildRequires: cairo-devel >= 1.0.4
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-style-xsl
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.10.1
+BuildRequires: glib2-devel >= 1:2.10.3
 %{?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
@@ -52,10 +48,10 @@
 BuildRequires: rpmbuild(macros) >= 1.197
 BuildRequires: xcursor-devel
 Requires(post,postun): /sbin/ldconfig
-Requires:      atk >= 1.8.0
-Requires:      cairo >= 0.9.2
-Requires:      glib2 >= 1:2.10.1
-Requires:      pango >= 1:1.10.0
+Requires:      atk >= 1.11.4
+Requires:      cairo >= 1.0.4
+Requires:      glib2 >= 1:2.10.3
+Requires:      pango >= 1:1.12.3
 Obsoletes:     gtk2
 Conflicts:     gtk2-engines < 1:2.2.0-6
 # autopanog.exe crashes with gtk+2 2.8.x and libgdiplus 1.1.8
@@ -122,12 +118,10 @@
 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:      X11-devel >= 1:6.8.0
+Requires:      atk-devel >= 1.11.4
+Requires:      glib2-devel >= 1:2.10.3
 Requires:      gtk-doc-common
-%{?with_xlibs:Requires:        libXfixes-devel}
-%{?with_xlibs:Requires:        libXi-devel}
 Requires:      pango-devel >= 1:1.10.0
 Requires:      xcursor-devel
 Obsoletes:     gtk2-devel
@@ -177,9 +171,8 @@
 %prep
 %setup -q -n gtk+-%{version}
 %patch0 -p1
-%{?with_xlibs:%patch1 -p1}
-%patch2 -p1
-%{?with_arch_confdir:%patch3 -p1}
+%patch1 -p1
+%{?with_arch_confdir:%patch2 -p1}
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -318,6 +311,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.200.2.7  2006/05/31 19:13:18  freetz
+- 2.8.18, GNOME 2.14.2 deps
+
 Revision 1.200.2.6  2006/05/14 20:35:04  baggins
 - up to 2.8.17
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gtk+2.spec?r1=1.200.2.6&r2=1.200.2.7&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to