packages: gtk+2/gtk+2.spec - merged from DEVEL

megabajt megabajt at pld-linux.org
Tue Mar 30 19:09:01 CEST 2010 

Author: megabajt                     Date: Tue Mar 30 17:09:01 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/gtk+2:
   gtk+2.spec (1.329 -> 1.330) 

---- Diffs:

================================================================
Index: packages/gtk+2/gtk+2.spec
diff -u packages/gtk+2/gtk+2.spec:1.329 packages/gtk+2/gtk+2.spec:1.330
--- packages/gtk+2/gtk+2.spec:1.329	Thu Mar 25 07:08:49 2010
+++ packages/gtk+2/gtk+2.spec	Tue Mar 30 19:08:55 2010
@@ -20,26 +20,27 @@
 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
@@ -47,26 +48,26 @@
 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
@@ -148,9 +149,9 @@
 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
@@ -229,8 +230,6 @@
 %setup -q -n gtk+-%{version}
 %patch0 -p1
 
-sed -i -e 's#libpng12#libpng#g' configure.in
-
 %build
 %{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
@@ -351,6 +350,7 @@
 %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
@@ -401,6 +401,7 @@
 %{_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
@@ -437,10 +438,17 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.330  2010/03/30 17:08:55  megabajt
+- merged from DEVEL
+
 Revision 1.329  2010/03/25 06:08:49  qboosh
 - jasper/JPEG-2000 loader is back
 - updated gtk-doc version
 
+Revision 1.314.2.10  2010/03/24 09:16:46  patrys
+- 2.20.0 stable
+- has to wait for stable glib2
+
 Revision 1.328  2010/03/18 08:34:25  lisu
 - 2.18.9 (fixes segfault)
 - rm -git.patch
@@ -454,6 +462,16 @@
 Revision 1.325  2010/03/16 12:25:37  lisu
 - up to 2.18.8
 
+Revision 1.314.2.9  2010/03/10 09:57:30  patrys
+- fixed a typo in the last commit
+
+Revision 1.314.2.8  2010/03/10 09:57:05  patrys
+- 2.19.7
+
+Revision 1.314.2.7  2010/02/24 13:50:51  lisu
+- updated to 2.19.6
+- drop gir-repository-devel BR (conflicts with atk-devel)
+
 Revision 1.324  2010/02/16 22:40:36  ankry
 - my supported, rel. 2
 
@@ -463,9 +481,22 @@
 Revision 1.322  2010/02/13 10:43:58  megabajt
 - updated to 2.18.7
 
+Revision 1.314.2.6  2010/02/10 18:18:23  megabajt
+- updated to 2.19.5
+
 Revision 1.321  2010/01/28 11:21:43  amateja
 - release 2
 
+Revision 1.314.2.5  2010/01/27 16:04:22  patrys
+- no my locale
+
+Revision 1.314.2.4  2010/01/27 14:21:11  patrys
+- 2.19.4
+
+Revision 1.314.2.3  2010/01/19 22:34:18  lisu
+- updated to 2.19.3
+- BR: gir-repository-devel
+
 Revision 1.320  2010/01/14 20:32:30  arekm
 - up to 2.18.6
 
@@ -482,9 +513,15 @@
 Revision 1.316  2009/12/01 19:43:22  sparky
 - added R: shared-mime-info to devel subpackage (gdk-pixbuf-csource uses it)
 
+Revision 1.314.2.2  2009/12/01 09:31:55  patrys
+- 2.19.1
+
 Revision 1.315  2009/11/12 10:03:48  patrys
 - rebuild
 - rel 2
+
+Revision 1.314.2.1  2009/11/02 13:25:06  lisu
+- up to 2.19.0
 
 Revision 1.314  2009/10/17 18:40:26  megabajt
 - updated to 2.18.3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+2/gtk+2.spec?r1=1.329&r2=1.330&f=u

More information about the pld-cvs-commit mailing list