SPECS: gnome-terminal.spec - 2.22.0 - merged from DEVEL

[patrys]

Author: patrys                       Date: Wed Mar 12 11:51:06 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.22.0
- merged from DEVEL

---- Files affected:
SPECS:
   gnome-terminal.spec (1.93 -> 1.94) 

---- Diffs:

================================================================
Index: SPECS/gnome-terminal.spec
diff -u SPECS/gnome-terminal.spec:1.93 SPECS/gnome-terminal.spec:1.94
--- SPECS/gnome-terminal.spec:1.93	Fri Jan 11 13:43:30 2008
+++ SPECS/gnome-terminal.spec	Wed Mar 12 12:51:01 2008
@@ -1,8 +1,8 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-# This causes <prev-tab> key do nothing on the first tab (instead of 
-# passing the keypress to the application running in the terminal). Ditto 
+# This causes <prev-tab> key do nothing on the first tab (instead of
+# passing the keypress to the application running in the terminal). Ditto
 # for the last tab. This is kinda annoying.
 %bcond_with	disable_prev_next_tab_sensitivity_changes
 # This is specific to PLD and causes an "unknown term type" on most other
@@ -15,28 +15,29 @@
 Summary:	GNOME Terminal
 Summary(pl.UTF-8):	Terminal dla GNOME
 Name:		gnome-terminal
-Version:	2.18.4
+Version:	2.22.0
 Release:	1
-License:	GPL
+License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.18/%{name}-%{version}.tar.bz2
-# Source0-md5:	e4429d66d0d2ede8e14756cfbc15d30a
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gnome-terminal/2.22/%{name}-%{version}.tar.bz2
+# Source0-md5:	e91f000b8157c668940a297d7cfbc9f8
 Patch0:		%{name}-TERM.patch
 Patch1:		%{name}-disable-prev_next-tab-sensitivity-changes.patch
 Patch2:		%{name}-desktop.patch
-Patch3:		%{name}-save-session-crash.patch
 Patch4:		%{name}-url-regex.patch
 URL:		http://www.gnome.org/
-BuildRequires:	GConf2-devel >= 2.20.0
+BuildRequires:	GConf2-devel >= 2.22.0
 BuildRequires:	autoconf >= 2.53
-BuildRequires:	automake
-BuildRequires:	gtk+2-devel >= 2:2.12.0
+BuildRequires:	automake >= 1:1.9
+BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.16.0
 BuildRequires:	gnome-common >= 2.20.0
 BuildRequires:	gnome-doc-utils >= 0.12.0
-BuildRequires:	gnome-vfs2-devel >= 2.20.0
+BuildRequires:	gnome-vfs2-devel >= 2.22.0
+BuildRequires:	gtk+2-devel >= 2:2.12.0
 BuildRequires:	intltool >= 0.36.2
 BuildRequires:	libglade2-devel >= 1:2.6.2
-BuildRequires:	libgnomeui-devel >= 2.20.0
+BuildRequires:	libgnomeui-devel >= 2.22.0
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 1:0.12.0
 BuildRequires:	rpmbuild(find_lang) >= 1.23
@@ -44,13 +45,13 @@
 BuildRequires:	scrollkeeper
 BuildRequires:	sed >= 4.0
 BuildRequires:	startup-notification-devel >= 0.8
-BuildRequires:	vte-devel >= 0.16.9
-Requires(post,preun):	GConf2
+BuildRequires:	vte-devel >= 0.16.13
 Requires(post,postun):	scrollkeeper
+Requires(post,preun):	GConf2
 Requires:	libgnomeui >= 2.20.0
 Requires:	startup-notification >= 0.8
-Requires:	vte >= 0.16.9
 Requires:	terminfo
+Requires:	vte >= 0.16.13
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -70,13 +71,12 @@
 %patch1 -p1
 %endif
 %patch2 -p1
-%patch3 -p1
 %if %{with classify_square_brackets_into_url_paths}
 %patch4 -p1
 %endif
 
-sed -i -e 's#sr\@Latn#sr\@latin#' po/LINGUAS
-mv po/sr\@{Latn,latin}.po
+sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
 
 %build
 %{__intltoolize}
@@ -84,6 +84,7 @@
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
+%{__autoheader}
 %{__automake}
 %configure \
 	--disable-schemas-install \
@@ -118,11 +119,11 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%attr(755,root,root) %{_bindir}/*
-%{_libdir}/bonobo/servers/*
+%attr(755,root,root) %{_bindir}/gnome-terminal
+%{_libdir}/bonobo/servers/gnome-terminal.server
 %{_datadir}/%{name}
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
+%{_desktopdir}/gnome-terminal.desktop
+%{_pixmapsdir}/gnome-terminal.png
 %{_sysconfdir}/gconf/schemas/gnome-terminal.schemas
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -131,9 +132,33 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2008-03-12 11:51:01  patrys
+- 2.22.0
+- merged from DEVEL
+
+Revision 1.92.2.6  2008-03-12 11:46:58  patrys
+- 2.22.0
+
+Revision 1.92.2.5  2008-02-12 15:24:54  patrys
+- 2.21.91.1
+
+Revision 1.92.2.4  2008-02-06 13:18:06  patrys
+- 2.21.90
+
+Revision 1.92.2.3  2008-01-15 15:31:14  patrys
+- 2.21.5
+
+Revision 1.92.2.2  2008-01-11 17:02:35  megabajt
+- updated deps
+- more verbose files
+- proper license
+
 Revision 1.93  2008-01-11 12:43:30  megabajt
 - updated to 2.18.4
 
+Revision 1.92.2.1  2007-12-21 03:12:56  patrys
+- 2.21.4
+
 Revision 1.92  2007-11-28 16:42:51  megabajt
 - updated to 2.18.3
 - use better way to fix locale name
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gnome-terminal.spec?r1=1.93&r2=1.94&f=u