- merged from DEVEL

Changed files:
    gtk+2.spec -> 1.330

diff --git a/gtk+2.spec b/gtk+2.spec
index 62ad1543164aff8dfef8ce1d583200014ed0503e..e96efe2411fbd805195de10bd8b3d57d158f0006 100644 (file)
--- a/gtk+2.spec
+++ b/gtk+2.spec
@@ -19,26 +19,27 @@ Summary(it.UTF-8):  Il toolkit per GIMP
 Summary(pl.UTF-8):     GIMP Toolkit
 Summary(tr.UTF-8):     GIMP ToolKit arayüz kitaplığı
 Name:          gtk+2
-Version:       2.18.9
+Version:       2.20.0
 Release:       1
 Epoch:         2
 License:       LGPL v2+
 Group:         X11/Libraries
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.18/gtk+-%{version}.tar.bz2
-# Source0-md5: f680d38c973635365acababacb1730ec
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.20/gtk+-%{version}.tar.bz2
+# Source0-md5: 5517f78b1eb9b1eb60bd48a0152d09e6
 Patch0:                %{name}-arch_confdir.patch
 URL:           http://www.gtk.org/
-BuildRequires: atk-devel >= 1:1.26.0
-BuildRequires: autoconf >= 2.54
+BuildRequires: atk-devel >= 1:1.30.0
+BuildRequires: autoconf >= 2.62
 BuildRequires: automake >= 1:1.7
 BuildRequires: cairo-devel >= 1.6.0
 %{?with_cups:BuildRequires:    cups-devel}
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-style-xsl
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.22.0
+BuildRequires: glib2-devel >= 1:2.24.0
+BuildRequires: gobject-introspection-devel >= 0.6.7
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.11}
-BuildRequires: gtk-doc-automake >= 1.8
+BuildRequires: gtk-doc-automake >= 1.11
 BuildRequires: jasper-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -46,26 +47,26 @@ BuildRequires:      libtiff-devel
 BuildRequires: libtool >= 1:1.4.2-9
 BuildRequires: libxml2-progs >= 1:2.6.31
 BuildRequires: libxslt-progs >= 1.1.20
-BuildRequires: pango-devel >= 1:1.24.0
+BuildRequires: pango-devel >= 1:1.26.0
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.197
-BuildRequires: sed >= 4.0
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xorg-lib-libXcomposite-devel
 BuildRequires: xorg-lib-libXcursor-devel
 BuildRequires: xorg-lib-libXdamage-devel
 BuildRequires: xorg-lib-libXext-devel
 BuildRequires: xorg-lib-libXfixes-devel
+BuildRequires: xorg-lib-libXft-devel
 BuildRequires: xorg-lib-libXi-devel
 BuildRequires: xorg-lib-libXinerama-devel
 BuildRequires: xorg-lib-libXrandr-devel >= 1.3.0
 BuildRequires: xorg-lib-libXrender-devel
-Requires:      atk >= 1:1.25.0
+Requires:      atk >= 1:1.30.0
 Requires:      cairo >= 1.6.0
-Requires:      glib2 >= 1:2.20.0
-Requires:      pango >= 1:1.23.0
+Requires:      glib2 >= 1:2.24.0
+Requires:      pango >= 1:1.26.0
 Requires:      xorg-lib-libXrandr >= 1.3.0
 %if %{with cups}
 # cups is used by default if gtk+ is built with cups
@@ -147,9 +148,9 @@ Summary(pl.UTF-8):  Pliki nagłówkowe i dokumentacja do GTK+
 Summary(tr.UTF-8):     GIMP araç takımı ve çizim takımı
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      atk-devel >= 1:1.25.0
-Requires:      glib2-devel >= 1:2.22.0
-Requires:      pango-devel >= 1:1.23.0
+Requires:      atk-devel >= 1:1.30.0
+Requires:      glib2-devel >= 1:2.24.0
+Requires:      pango-devel >= 1:1.26.0
 Requires:      shared-mime-info
 Requires:      xorg-lib-libX11-devel
 Requires:      xorg-lib-libXcomposite-devel
@@ -228,8 +229,6 @@ Moduł GTK+ do drukowania przez CUPS.
 %setup -q -n gtk+-%{version}
 %patch0 -p1
 
-sed -i -e 's#libpng12#libpng#g' configure.in
-
 %build
 %{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
@@ -350,6 +349,7 @@ exit 0
 %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/loaders/libpixbufloader-*.so
 %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/printbackends/libprintbackend-file.so
 %attr(755,root,root) %{_libdir}/gtk-2.0/%{abivers}/printbackends/libprintbackend-lpr.so
+%{_libdir}/girepository-1.0/*.typelib
 
 # XXX: just demo data - move to examples?
 %{_datadir}/gtk-2.0
@@ -400,6 +400,7 @@ exit 0
 %{_pkgconfigdir}/gtk+-x11-2.0.pc
 %{_mandir}/man1/gdk-pixbuf-csource.1*
 %{_mandir}/man1/gtk-builder-convert.1*
+%{_datadir}/gir-1.0/*.gir
 
 %if %{with static_libs}
 %files static