SPECS: gtk+2.spec - merged from DEVEL

Tue Aug 30 20:35:19 CEST 2005

Author: arekm                        Date: Tue Aug 30 18:35:19 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   gtk+2.spec (1.182 -> 1.183) 

---- Diffs:

================================================================
Index: SPECS/gtk+2.spec
diff -u SPECS/gtk+2.spec:1.182 SPECS/gtk+2.spec:1.183

--- SPECS/gtk+2.spec:1.182	Sun Aug 28 21:23:03 2005
+++ SPECS/gtk+2.spec	Tue Aug 30 20:35:14 2005
@@ -2,7 +2,6 @@
 #
 # Conditional build:
 %bcond_without	doc		# disable gtk-doc
-%bcond_without	menushadow	# disable menu shadow feature
 %bcond_without	static_libs	# don't build static library
 %bcond_with	xlibs		# use pkgconfig to find libX11
 #
@@ -15,26 +14,27 @@
 Summary(pl):	Gimp Toolkit
 Summary(tr):	Gimp ToolKit arayüz kitaplýđý
 Name:		gtk+2
-Version:	2.6.10
+Version:	2.8.3
 Release:	1
 Epoch:		2
 License:	LGPL
 Group:		X11/Libraries
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-%{version}.tar.bz2
-# Source0-md5:	520090ef291e35ba93397060e20f5025
+Source0:	ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-%{version}.tar.bz2
+# Source0-md5:	1e7a49eaf078af8aeb84369a5fefa8c0
 Patch0:		%{name}-insensitive-iain.patch
-Patch1:		%{name}-menushadow.patch
-Patch2:		%{name}-xlibs.patch
+Patch1:		%{name}-xlibs.patch
+# from CVS, should disapear in the next version
 URL:		http://www.gtk.org/
 Icon:		gtk+.xpm
 %{!?with_xlibs: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:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 1:2.6.3
+BuildRequires:	glib2-devel >= 1:2.8.1
 %{?with_doc:BuildRequires:	gtk-doc >= 1.0}
 %{?with_xlibs:BuildRequires:	libXfixes-devel}
 %{?with_xlibs:BuildRequires:	libXi-devel}
@@ -44,15 +44,16 @@
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libxml2-progs
 BuildRequires:	libxslt-progs
-BuildRequires:	pango-devel >= 1:1.8.0
+BuildRequires:	pango-devel >= 1:1.10.0
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	xcursor-devel
 Requires(post,postun):	/sbin/ldconfig
 Requires:	atk >= 1.8.0
-Requires:	glib2 >= 1:2.6.4
-Requires:	pango >= 1:1.8.0
+Requires:	cairo >= 0.9.2
+Requires:	glib2 >= 1:2.8.0
+Requires:	pango >= 1:1.10.0
 Obsoletes:	gtk2
 Conflicts:	gtk2-engines < 1:2.2.0-6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -113,11 +114,11 @@
 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.6.3
+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.8.0
+Requires:	pango-devel >= 1:1.10.0
 Requires:	xcursor-devel
 Obsoletes:	gtk2-devel
 
@@ -142,8 +143,7 @@
 %prep
 %setup -q -n gtk+-%{version}
 %patch0 -p1
-%{?with_menushadow:%patch1 -p1}
-%{?with_xlibs:%patch2 -p1}
+%{?with_xlibs:%patch1 -p1}
 
 %build
 %{__gtkdocize}
@@ -245,6 +245,9 @@
 %dir %{_datadir}/themes/Emacs
 %dir %{_datadir}/themes/Emacs/gtk-*
 %{_datadir}/themes/Emacs/gtk-*/gtkrc
+%dir %{_datadir}/themes/Raleigh
+%dir %{_datadir}/themes/Raleigh/gtk-*
+%{_datadir}/themes/Raleigh/gtk-*/gtkrc
 
 %files devel
 %defattr(644,root,root,755)
@@ -272,6 +275,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.183  2005/08/30 18:35:14  arekm
+- merged from DEVEL
+
 Revision 1.182  2005/08/28 19:23:03  qboosh
 - updated to 2.6.10
 - removed obsolete bug312710 patch (alternative fix included)
@@ -281,6 +287,41 @@
 
 Revision 1.180  2005/08/01 22:27:41  freetz
 - 2.6.9
+
+Revision 1.179.2.11  2005/08/30 07:49:14  aflinta
+- 2.8.3
+
+Revision 1.179.2.10  2005/08/24 19:01:00  aflinta
+- 2.8.2
+
+Revision 1.179.2.9  2005/08/24 08:00:08  aflinta
+- 2.8.1
+
+Revision 1.179.2.8  2005/08/17 20:18:52  aflinta
+- require official releases
+
+Revision 1.179.2.7  2005/08/17 10:07:26  jpc
+- add a ptch from Gtk+2 CVS fixing the annoying
+  warning about pixmap colormaps.
+
+Revision 1.179.2.6  2005/08/14 00:17:57  freetz
+- 2.8.0
+
+Revision 1.179.2.5  2005/08/03 21:50:19  aflinta
+- up to version 2.7.5
+
+Revision 1.179.2.4  2005/07/23 11:07:58  freetz
+- 2.7.4, pango cvs HEAD required
+
+Revision 1.179.2.3  2005/07/21 08:24:10  freetz
+- 2.7.3, cairo >= 0.5.2 required
+
+Revision 1.179.2.2  2005/07/10 17:39:53  freetz
+- 2.7.2
+
+Revision 1.179.2.1  2005/07/02 20:38:24  freetz
+- 2.7.1, dropped menushadow patch (use composite ext instead if you want),
+  use ftp.gtk.org
 
 Revision 1.179  2005/06/16 18:54:38  freetz
 - typo
================================================================

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


